Merge remote-tracking branch 'origin' into km/test-tag-build

also install bash
2023-06-12 12:08:12 -05:00 · 2023-06-08 11:42:05 -05:00 · 2023-06-08 11:41:07 -05:00 · 2023-06-08 11:32:09 -05:00
2016 changed files with 33338 additions and 71593 deletions
@@ -226,8 +226,7 @@ exports[`better eslint`] = {
    "packages/grafana-data/src/panel/registryFactories.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.", "2"]
    ],
    "packages/grafana-data/src/text/text.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -463,7 +462,8 @@ exports[`better eslint`] = {
    ],
    "packages/grafana-data/src/types/select.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"]
    ],
    "packages/grafana-data/src/types/templateVars.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -544,9 +544,9 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "42"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "43"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "44"],
-      [0, 0, 0, "Do not use any type assertions.", "45"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "45"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "46"],
-      [0, 0, 0, "Do not use any type assertions.", "47"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "47"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "48"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "49"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "50"],
@@ -555,11 +555,11 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "53"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "54"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "55"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "56"],
+      [0, 0, 0, "Do not use any type assertions.", "56"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "57"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "58"],
+      [0, 0, 0, "Do not use any type assertions.", "58"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "59"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "60"],
+      [0, 0, 0, "Do not use any type assertions.", "60"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "61"],
      [0, 0, 0, "Do not use any type assertions.", "62"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "63"],
@@ -569,9 +569,9 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "67"],
      [0, 0, 0, "Do not use any type assertions.", "68"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "69"],
-      [0, 0, 0, "Do not use any type assertions.", "70"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "71"],
-      [0, 0, 0, "Do not use any type assertions.", "72"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "70"],
+      [0, 0, 0, "Do not use any type assertions.", "71"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "72"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "73"],
      [0, 0, 0, "Do not use any type assertions.", "74"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "75"],
@@ -586,13 +586,7 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "84"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "85"],
      [0, 0, 0, "Do not use any type assertions.", "86"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "87"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "88"],
-      [0, 0, 0, "Do not use any type assertions.", "89"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "90"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "91"],
-      [0, 0, 0, "Do not use any type assertions.", "92"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "93"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "87"]
    ],
    "packages/grafana-data/src/utils/Registry.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -873,7 +867,8 @@ exports[`better eslint`] = {
      [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.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"]
    ],
    "packages/grafana-toolkit/src/cli/tasks/task.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -1068,6 +1063,16 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
    ],
+    "packages/grafana-ui/src/components/Segment/Segment.story.tsx: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"]
+    ],
    "packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -1669,7 +1674,8 @@ 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, "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.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
    ],
    "public/app/core/utils/fetch.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -1899,7 +1905,8 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
    ],
    "public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
    ],
    "public/app/features/alerting/unified/components/rule-editor/AnnotationKeyInput.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -2000,13 +2007,23 @@ exports[`better eslint`] = {
      [0, 0, 0, "Do not use any type assertions.", "4"],
      [0, 0, 0, "Do not use any type assertions.", "5"]
    ],
+    "public/app/features/annotations/components/AnnotationResultMapper.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
    "public/app/features/annotations/events_processing.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
+    "public/app/features/annotations/executeAnnotationQuery.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
    "public/app/features/annotations/standardAnnotationSupport.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, "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, "Do not use any type assertions.", "5"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "6"]
    ],
    "public/app/features/canvas/element.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2015,6 +2032,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/features/canvas/elements/notFound.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
    "public/app/features/canvas/runtime/element.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -2142,7 +2162,9 @@ exports[`better eslint`] = {
    "public/app/features/dashboard/components/PanelEditor/getVisualizationOptions.tsx: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.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
    ],
    "public/app/features/dashboard/components/PanelEditor/types.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -2177,15 +2199,20 @@ exports[`better eslint`] = {
    "public/app/features/dashboard/components/ShareModal/ShareExport.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
-    "public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx:5381": [
+    "public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
+    "public/app/features/dashboard/components/TransformationsEditor/TransformationEditor.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "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"]
+    ],
    "public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.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, "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, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"]
    ],
    "public/app/features/dashboard/components/VersionHistory/useDashboardRestore.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -2205,7 +2232,8 @@ exports[`better eslint`] = {
      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "4"]
    ],
    "public/app/features/dashboard/dashgrid/DashboardGrid.tsx: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"]
    ],
    "public/app/features/dashboard/dashgrid/DashboardPanel.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -2228,13 +2256,16 @@ exports[`better eslint`] = {
    "public/app/features/dashboard/services/DashboardLoaderSrv.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.", "2"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
    ],
    "public/app/features/dashboard/services/PublicDashboardDataSource.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
    "public/app/features/dashboard/services/TimeSrv.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
    ],
    "public/app/features/dashboard/state/DashboardMigrator.test.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2390,7 +2421,8 @@ exports[`better eslint`] = {
    ],
    "public/app/features/dashboard/state/TimeModel.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"]
    ],
    "public/app/features/dashboard/state/actions.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -2408,22 +2440,48 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
    "public/app/features/dashboard/state/reducers.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
    ],
    "public/app/features/dashboard/utils/getPanelMenu.test.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"],
+      [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"]
    ],
    "public/app/features/dashboard/utils/getPanelMenu.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [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.", "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, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
+      [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, "Do not use any type assertions.", "15"]
    ],
    "public/app/features/dashboard/utils/panelMerge.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.", "2"],
+      [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, "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, "Unexpected any. Specify a different type.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
    ],
    "public/app/features/datasources/components/BasicSettings.tsx:5381": [
      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
@@ -2451,8 +2509,10 @@ exports[`better eslint`] = {
    ],
    "public/app/features/datasources/state/actions.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, "Do not use any type assertions.", "2"]
+      [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"],
@@ -2491,7 +2551,14 @@ exports[`better eslint`] = {
    ],
    "public/app/features/dimensions/utils.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, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    ],
+    "public/app/features/explore/ElapsedTime.tsx:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
+    "public/app/features/explore/ExplorePage.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
    "public/app/features/explore/ExploreQueryInspector.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -2553,6 +2620,11 @@ exports[`better eslint`] = {
      [0, 0, 0, "Do not use any type assertions.", "0"],
      [0, 0, 0, "Do not use any type assertions.", "1"]
    ],
+    "public/app/features/explore/hooks/useStateSync.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"]
+    ],
    "public/app/features/explore/spec/helper/setup.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -2563,9 +2635,24 @@ exports[`better eslint`] = {
    "public/app/features/explore/spec/queryHistory.test.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
+    "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"]
+    ],
+    "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"],
@@ -2700,6 +2787,11 @@ exports[`better eslint`] = {
    "public/app/features/manage-dashboards/components/ImportDashboardLibraryPanelsList.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
+    "public/app/features/manage-dashboards/services/ValidationSrv.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"]
+    ],
    "public/app/features/manage-dashboards/state/actions.test.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
@@ -2885,13 +2977,9 @@ exports[`better eslint`] = {
      [0, 0, 0, "Do not use any type assertions.", "7"],
      [0, 0, 0, "Do not use any type assertions.", "8"]
    ],
-    "public/app/features/plugins/sandbox/sandbox_components.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
    "public/app/features/plugins/sandbox/sandbox_plugin_loader.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/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -2926,8 +3014,9 @@ exports[`better eslint`] = {
    ],
    "public/app/features/query/components/QueryGroup.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, "Unexpected any. Specify a different type.", "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/query/components/QueryGroupOptions.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -2989,13 +3078,6 @@ exports[`better eslint`] = {
    "public/app/features/sandbox/TestStuffPage.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
-    "public/app/features/scenes/dashboard/test-utils.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, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
-    ],
    "public/app/features/search/components/SearchCard.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -3797,7 +3879,23 @@ exports[`better eslint`] = {
      [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.", "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"],
+      [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, "Unexpected any. Specify a different type.", "20"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "21"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "22"]
    ],
    "public/app/plugins/datasource/elasticsearch/hooks/useStatelessReducer.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -4145,7 +4243,18 @@ exports[`better eslint`] = {
    ],
    "public/app/plugins/datasource/influxdb/response_parser.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, "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, "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"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
    ],
    "public/app/plugins/datasource/influxdb/specs/datasource.test.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -4172,6 +4281,9 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
      [0, 0, 0, "Do not use any type assertions.", "3"]
    ],
+    "public/app/plugins/datasource/influxdb/specs/response_parser.test.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
    "public/app/plugins/datasource/jaeger/datasource.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -4411,7 +4523,8 @@ exports[`better eslint`] = {
      [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.", "30"],
+      [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"],
@@ -4476,7 +4589,8 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
    ],
    "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
    ],
    "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -4591,7 +4705,9 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
      [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.", "14"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
    ],
    "public/app/plugins/datasource/tempo/datasource.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -4623,9 +4739,11 @@ exports[`better eslint`] = {
      [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, "Do not use any type assertions.", "7"],
+      [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.", "9"],
+      [0, 0, 0, "Do not use any type assertions.", "10"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
    ],
    "public/app/plugins/datasource/tempo/testResponse.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -4881,7 +4999,7 @@ exports[`better eslint`] = {
    "public/app/plugins/panel/geomap/utils/selection.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
-    "public/app/plugins/panel/geomap/utils/tooltip.ts:5381": [
+    "public/app/plugins/panel/geomap/utils/tootltip.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
    "public/app/plugins/panel/graph/GraphContextMenuCtrl.ts:5381": [
@@ -5269,13 +5387,17 @@ exports[`better eslint`] = {
      [0, 0, 0, "Do not use any type assertions.", "13"],
      [0, 0, 0, "Do not use any type assertions.", "14"],
      [0, 0, 0, "Do not use any type assertions.", "15"],
-      [0, 0, 0, "Do not use any type assertions.", "16"]
+      [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"]
    ],
    "public/app/plugins/panel/histogram/Histogram.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, "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.", "3"],
+      [0, 0, 0, "Do not use any type assertions.", "4"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
    ],
    "public/app/plugins/panel/live/LiveChannelEditor.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -2,7 +2,7 @@ import { BettererFileTest } from '@betterer/betterer';
 import { promises as fs } from 'fs';
 import { ESLint, Linter } from 'eslint';
 import path from 'path';
-import { glob } from 'glob';
+import glob from 'glob';

 export default {
  'better eslint': () =>
@@ -11,6 +11,9 @@ load("scripts/drone/events/pr.star", "pr_pipelines")
 load("scripts/drone/events/main.star", "main_pipelines")
 load(
    "scripts/drone/events/release.star",
+    "artifacts_page_pipeline",
+    "enterprise2_pipelines",
+    "enterprise_pipelines",
    "integration_test_pipelines",
    "oss_pipelines",
    "publish_artifacts_pipelines",
@@ -25,12 +28,14 @@ load(
 load(
    "scripts/drone/pipelines/publish_images.star",
    "publish_image_pipelines_public",
+    "publish_image_pipelines_security",
 )
 load(
    "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_build_container_image_pipeline",
    "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/pipelines/windows.star",
    "windows_test_backend",
@@ -44,7 +49,14 @@ def main(_ctx):
        pr_pipelines() +
        main_pipelines() +
        oss_pipelines() +
+        enterprise_pipelines() +
+        enterprise2_pipelines() +
        publish_image_pipelines_public() +
+        publish_image_pipelines_security() +
+        publish_github_pipeline("public") +
+        publish_github_pipeline("security") +
+        publish_aws_marketplace_pipeline("public") +
+        publish_artifacts_pipelines("security") +
        publish_artifacts_pipelines("public") +
        publish_npm_pipelines() +
        publish_packages_pipeline() +
@@ -54,10 +66,10 @@ def main(_ctx):
            "event": ["promote"],
            "target": ["test-windows"],
        }, "oss", "testing")] +
+        artifacts_page_pipeline() +
        version_branch_pipelines() +
        integration_test_pipelines() +
        publish_ci_windows_test_image_pipeline() +
-        publish_ci_build_container_image_pipeline() +
        cronjobs() +
        secrets()
    )
@@ -44,6 +44,12 @@
    "@typescript-eslint/no-redeclare": ["error"]
  },
  "overrides": [
+    {
+      "files": ["public/app/features/scenes/**/*.{ts,tsx}"],
+      "rules": {
+        "@typescript-eslint/explicit-member-accessibility": ["error", { "accessibility": "explicit" }]
+      }
+    },
    {
      "files": ["packages/grafana-ui/src/components/uPlot/**/*.{ts,tsx}"],
      "rules": {
@@ -68,18 +74,20 @@
    },
    {
      "extends": ["plugin:jsx-a11y/recommended"],
-      "files": ["**/*.tsx"],
-      "excludedFiles": ["**/*.{spec,test}.tsx"],
+      "files": ["**/*"],
+      "excludedFiles": ["**/*.{spec,test}.{ts,tsx}"],
      "rules": {
        // rules marked "off" are those left in the recommended preset we need to fix
        // we should remove the corresponding line and fix them one by one
        // any marked "error" contain specific overrides we'll need to keep
+        "jsx-a11y/click-events-have-key-events": "off",
        "jsx-a11y/no-autofocus": [
          "error",
          {
            "ignoreNonDOM": true
          }
        ],
+        "jsx-a11y/no-static-element-interactions": "off",
        "jsx-a11y/label-has-associated-control": [
          "error",
          {
@@ -33,26 +33,24 @@
 /devenv/README.md @grafana/docs-grafana

 # Technical documentation
-# `make docs` procedure and related workflows are owned @grafana/docs-tooling. Slack #docs.
-# Documentation sources might have different owners.
-/docs/                                                                       @grafana/docs-tooling
-/docs/sources/                                                               @Eve832
-/docs/sources/administration/                                                @Eve832 @GrafanaWriter
-/docs/sources/alerting/                                                      @brendamuir
-/docs/sources/dashboards/                                                    @imatwawana
-/docs/sources/datasources/                                                   @lwandz13
-/docs/sources/explore/                                                       @Eve832 @GrafanaWriter
-/docs/sources/fundamentals                                                   @chri2547
-/docs/sources/getting-started/                                               @chri2547
-/docs/sources/introduction/                                                  @chri2547
-/docs/sources/old-alerting/                                                  @brendamuir
-/docs/sources/panels-visualizations/                                         @imatwawana
-/docs/sources/release-notes/                                                 @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/                                                 @chri2547
-/docs/sources/upgrade-guide/                                                 @chri2547 @imatwawana
-/docs/sources/whatsnew/                                                      @chri2547 @imatwawana
-/docs/sources/developers/plugins/                                            @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/docs/sources/developers/plugins/introduction-to-plugin-development/backend/ @Eve832 @grafana/plugins-platform-backend
+/docs/                                    @Eve832 @jdbaldry
+/docs/sources/                            @Eve832
+/docs/sources/administration/             @Eve832 @GrafanaWriter
+/docs/sources/alerting/                   @brendamuir
+/docs/sources/dashboards/                 @imatwawana
+/docs/sources/datasources/                @lwandz13
+/docs/sources/explore/                    @Eve832 @GrafanaWriter
+/docs/sources/fundamentals                @chri2547
+/docs/sources/getting-started/            @chri2547
+/docs/sources/introduction/               @chri2547
+/docs/sources/old-alerting/               @brendamuir
+/docs/sources/panels-visualizations/      @imatwawana
+/docs/sources/release-notes/              @Eve832 @GrafanaWriter
+/docs/sources/setup-grafana/              @chri2547
+/docs/sources/upgrade-guide/              @chri2547 @imatwawana
+/docs/sources/whatsnew/                   @chri2547 @imatwawana
+/docs/sources/developers/plugins/         @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/backend/ @Eve832 @grafana/plugins-platform-backend

 # Backend code
 /go.mod @grafana/backend-platform
@@ -68,7 +66,6 @@
 /pkg/api/ @grafana/backend-platform
 /pkg/bus/ @grafana/backend-platform
 /pkg/cmd/ @grafana/backend-platform
-/pkg/systemd/ @grafana/backend-platform
 /pkg/components/apikeygen/ @grafana/grafana-authnz-team
 /pkg/components/satokengen/ @grafana/grafana-authnz-team
 /pkg/components/dashdiffs/ @grafana/backend-platform
@@ -163,14 +160,14 @@
 /devenv/docker/blocks/elastic* @grafana/observability-logs

 /devenv/bulk-dashboards/ @grafana/dashboards-squad
-/devenv/bulk_alerting_dashboards/ @grafana/alerting-backend-product
+/devenv/bulk_alerting_dashboards/ @grafana/alerting-squad-backend
 /devenv/create_docker_compose.sh @grafana/backend-platform
 /devenv/dashboards.yaml @grafana/dashboards-squad
 /devenv/datasources.yaml @grafana/backend-platform
 /devenv/datasources_docker.yaml @grafana/backend-platform
 /devenv/dev-dashboards-without-uid/ @grafana/dashboards-squad
 /devenv/dev-dashboards/ @grafana/dashboards-squad
-/devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-backend-product
+/devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-squad-backend
 /devenv/docker/blocks/clickhouse/ @grafana/partner-datasources
 /devenv/docker/blocks/collectd/ @grafana/observability-metrics
 /devenv/docker/blocks/grafana/ @grafana/grafana-as-code
@@ -180,7 +177,7 @@
 /devenv/docker/blocks/influxdb/ @grafana/observability-metrics
 /devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
 /devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
-/devenv/docker/blocks/maildev/ @grafana/alerting-frontend
+/devenv/docker/blocks/maildev/ @grafana/alerting-squad-frontend
 /devenv/docker/blocks/mariadb/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/memcached/ @grafana/backend-platform
 /devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
@@ -208,7 +205,7 @@
 /devenv/docker/buildcontainer/ @bergquist
 /devenv/docker/compose_header.yml @grafana/backend-platform
 /devenv/docker/debtest/ @bergquist
-/devenv/docker/ha-test-unified-alerting/ @grafana/alerting-backend-product
+/devenv/docker/ha-test-unified-alerting/ @grafana/alerting-squad-backend
 /devenv/docker/ha_test/ @grafana/backend-platform
 /devenv/docker/loadtest/ @grafana/backend-platform
 /devenv/docker/rpmtest/ @grafana/backend-platform
@@ -218,7 +215,7 @@
 /devenv/setup.sh @grafana/backend-platform

 # Emails
-/emails/ @grafana/alerting-frontend
+/emails/ @grafana/alerting-squad-frontend

 #Packaging
 /packaging/ @DanCech
@@ -269,11 +266,11 @@
 /pkg/kindsysreport/ @grafana/grafana-app-platform-squad

 # Alerting
-/pkg/services/ngalert/ @grafana/alerting-backend-product
-/pkg/services/sqlstore/migrations/ualert/ @grafana/alerting-backend-product
-/pkg/services/alerting/ @grafana/alerting-backend-product
-/pkg/tests/api/alerting/ @grafana/alerting-backend-product
-/public/app/features/alerting/ @grafana/alerting-frontend
+/pkg/services/ngalert/ @grafana/alerting-squad-backend
+/pkg/services/sqlstore/migrations/ualert/ @grafana/alerting-squad-backend
+/pkg/services/alerting/ @grafana/alerting-squad-backend
+/pkg/tests/api/alerting/ @grafana/alerting-squad-backend
+/public/app/features/alerting/ @grafana/alerting-squad-frontend

 # Library Services
 /pkg/services/libraryelements/ @grafana/grafana-frontend-platform
@@ -307,8 +304,8 @@
 /packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/Gauge/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/BarGauge/ @grafana/dataviz-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
@@ -381,7 +378,7 @@ lerna.json @grafana/frontend-ops
 /public/app/features/manage-dashboards/ @grafana/dashboards-squad
 /public/app/features/notifications/ @grafana/grafana-frontend-platform
 /public/app/features/org/ @grafana/grafana-frontend-platform
-/public/app/features/panel/ @grafana/dashboards-squad
+/public/app/features/panel/ @grafana/grafana-frontend-platform
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
 /public/app/features/profile/ @grafana/grafana-frontend-platform
@@ -398,15 +395,15 @@ lerna.json @grafana/frontend-ops
 /public/app/features/transformers/ @grafana/dataviz-squad
 /public/app/features/users/ @grafana/grafana-authnz-team
 /public/app/features/variables/ @grafana/dashboards-squad
-/public/app/plugins/panel/alertGroups/ @grafana/alerting-frontend
-/public/app/plugins/panel/alertlist/ @grafana/alerting-frontend
+/public/app/plugins/panel/alertGroups/ @grafana/alerting-squad-frontend
+/public/app/plugins/panel/alertlist/ @grafana/alerting-squad-frontend
 /public/app/plugins/panel/annolist/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/barchart/ @grafana/dataviz-squad
-/public/app/plugins/panel/bargauge/ @grafana/dataviz-squad
+/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/dataviz-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
 /public/app/plugins/panel/heatmap/ @grafana/dataviz-squad
@@ -415,7 +412,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/piechart/ @grafana/dataviz-squad
+/public/app/plugins/panel/piechart/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
 /public/app/plugins/panel/status-history/ @grafana/dataviz-squad
 /public/app/plugins/panel/table/ @grafana/grafana-bi-squad
@@ -427,7 +424,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/panel/candlestick/ @grafana/dataviz-squad
 /public/app/plugins/panel/live/ @grafana/grafana-app-platform-squad
 /public/app/plugins/panel/news/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/stat/ @grafana/dataviz-squad
+/public/app/plugins/panel/stat/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/text/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/welcome/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/xychart/ @grafana/dataviz-squad
@@ -437,7 +434,7 @@ lerna.json @grafana/frontend-ops
 /public/app/store/ @grafana/grafana-frontend-platform
 /public/app/types/ @grafana/grafana-frontend-platform
 /public/dashboards/ @grafana/dashboards-squad
-/public/fonts/ @grafana/alerting-frontend
+/public/fonts/ @grafana/alerting-squad-frontend
 /public/gazetteer/ @ryantxu
 /public/img/ @grafana/grafana-frontend-platform
 /public/lib/ @grafana/grafana-frontend-platform
@@ -446,6 +443,7 @@ lerna.json @grafana/frontend-ops
 /public/robots.txt @grafana/frontend-ops
 /public/sass/ @grafana/grafana-frontend-platform
 /public/test/ @grafana/grafana-frontend-platform
+/public/testdata/ @grafana/grafana-frontend-platform
 /public/views/ @grafana/grafana-frontend-platform

 /public/app/features/explore/Logs/ @grafana/observability-logs
@@ -598,7 +596,7 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
-/.github/workflows/doc-validator.yml @grafana/docs-tooling
+/.github/workflows/doc-validator.yml @grafana/docs-grafana
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
 /.github/workflows/github-release.yml @torkelo
 /.github/workflows/issue-labeled.yml @armandgrillet
@@ -612,25 +610,15 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
 /.github/workflows/pr-commands-closed.yml @tolzhabayev
 /.github/workflows/pr-commands.yml @marefr
-/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery
-/.github/workflows/sync-mirror.yml @grafana/grafana-delivery
-/.github/workflows/publish-technical-documentation-next.yml @grafana/docs-tooling
-/.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling
-/.github/workflows/remove-milestone.yml @grafana/grafana-delivery
+/.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana
+/.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana
+/.github/workflows/remove-milestone.yml @grafana/grafana-frontend-platform
 /.github/workflows/sbom-report.yml @grafana/security-team
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
 /.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/grafana-delivery
+/.github/workflows/stale.yml @grafana/grafana-frontend-platform
 /.github/workflows/update-changelog.yml @grafana/grafana-delivery
-/.github/workflows/update-make-docs.yml @grafana/docs-tooling
 /.github/workflows/snyk.yml @grafana/security-team
-/.github/workflows/scripts/kinds/verify-kinds.go @grafana/grafana-as-code
-/.github/workflows/publish-kinds-next.yml @grafana/grafana-as-code
-/.github/workflows/publish-kinds-release.yml @grafana/grafana-as-code
-/.github/workflows/verify-kinds.yml @grafana/grafana-as-code
-/.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad
-/.github/workflows/ephemeral-instances.yml @grafana/grafana-operator-experience-squad
-

 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -645,7 +633,7 @@ embed.go @grafana/grafana-as-code
 /conf/ldap.toml @grafana/grafana-authnz-team
 /conf/ldap_multiple.toml @grafana/grafana-authnz-team
 /conf/provisioning/access-control/ @grafana/grafana-authnz-team
-/conf/provisioning/alerting/ @grafana/alerting-backend-product
+/conf/provisioning/alerting/ @grafana/alerting-squad-backend
 /conf/provisioning/dashboards/ @grafana/dashboards-squad
 /conf/provisioning/datasources/ @grafana/plugins-platform-backend
 /conf/provisioning/notifiers/ @bergquist
@@ -1,14 +1,14 @@
 name: New Bug Report
 description: File a bug report
-title: "Product Area: Short description of bug"
+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
+        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:
@@ -20,61 +20,108 @@ body:
    attributes:
      value: |
       #
-
  - type: textarea
+    id: bug-describe
    attributes:
-      label: What happened?
-      description: "**Hot Tip:** Record your screen and attach it here."
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: What did you expect to happen?
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Did this work before?
-      description: "If this worked before, what Grafana version worked correctly?"
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: How do we reproduce it?
-      placeholder: "Steps to reproduce..."
-      value: |
-        1.
-        2.
-        3.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Is the bug inside a dashboard panel?
+      label: |
+        
+        # What went wrong?
+        
      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.
+        #
+        Describe your bug. What happened? What did you expect to happen?

-  - type: textarea
-    attributes:
-      label: Environment (with versions)?
-      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: "Grafana, OS, and Browser versions..."
+        **Hot Tip:** Record your screen and add it here as a gif. 
+      placeholder: Tell us what you see!
      value: |
-        Grafana:
-        OS:
-        Browser:
-    validations:
-      required: false
+        **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?
+      label: Grafana Platform?
+      description: |
+        **How** are you running/deploying Grafana?
      options:
        - I use Grafana Cloud
        - Docker
@@ -85,9 +132,46 @@ body:
        - I don't know
    validations:
      required: false
-
  - type: input
+    id: user-os
    attributes:
-      label: Datasource(s)?
-      description: "Is this issue specific to a datasource plugin? (Please list all that apply)"
+      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
@@ -328,7 +328,7 @@
    "name": "area/panel/bargauge",
    "action": "addToProject",
    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
+      "url": "https://github.com/orgs/grafana/projects/72"
    }
  },
  {
@@ -336,7 +336,7 @@
    "name": "area/panel/gauge",
    "action": "addToProject",
    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
+      "url": "https://github.com/orgs/grafana/projects/72"
    }
  },
  {
@@ -384,7 +384,7 @@
    "name": "area/panel/piechart",
    "action": "addToProject",
    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
+      "url": "https://github.com/orgs/grafana/projects/72"
    }
  },
  {
@@ -392,7 +392,7 @@
    "name": "area/panel/stat",
    "action": "addToProject",
    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
+      "url": "https://github.com/orgs/grafana/projects/72"
    }
  },
  {
@@ -187,7 +187,7 @@
    "type": "author",
    "name": "pr/external",
    "notMemberOf": { "org": "grafana" },
-    "ignoreList": ["renovate[bot]","dependabot[bot]","grafana-delivery-bot[bot]","grafanabot"],
+    "ignoreList": ["renovate[bot]","dependabot[bot]"],
    "action": "updateLabel",
    "addLabel": "pr/external"
  },
@@ -394,61 +394,5 @@
    "addToProject": {
      "url": "https://github.com/orgs/grafana/projects/56"
    }
-  },
-  {
-    "type": "changedfiles",
-    "matches": ["public/app/plugins/panel/gauge/**/*", "/packages/grafana-ui/src/components/Gauge/**/*"],
-    "action": "updateLabel",
-    "addLabel": "area/panel/gauge"
-  },
-  {
-    "type": "label",
-    "name": "area/panel/gauge",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "changedfiles",
-    "matches": ["public/app/plugins/panel/bargauge/**/*", "/packages/grafana-ui/src/components/BarGauge/**/*"],
-    "action": "updateLabel",
-    "addLabel": "area/panel/gauge"
-  },
-  {
-    "type": "label",
-    "name": "area/panel/bargauge",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "changedfiles",
-    "matches": ["public/app/plugins/panel/stat/**/*"],
-    "action": "updateLabel",
-    "addLabel": "area/panel/stat"
-  },
-  {
-    "type": "label",
-    "name": "area/panel/stat",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "changedfiles",
-    "matches": ["public/app/plugins/panel/piechart/**/*"],
-    "action": "updateLabel",
-    "addLabel": "area/panel/piechart"
-  },
-  {
-    "type": "label",
-    "name": "area/panel/piechart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
  }
 ]
@@ -17,16 +17,10 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run backport
        uses: ./actions/backport
        with:
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{ steps.generate_token.outputs.token }}
-          labelsToAdd: "backport"
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          labelsToAdd: "backport,no-changelog"
          title: "[{{base}}] {{originalTitle}}"
@@ -6,12 +6,12 @@ on:
        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
        required: true
 env:
-  YARN_ENABLE_IMMUTABLE_INSTALLS: false
+    YARN_ENABLE_IMMUTABLE_INSTALLS: false
 jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-      # This is a basic workflow to help you get started with Actions
+    # This is a basic workflow to help you get started with Actions
      - uses: actions-ecosystem/action-regex-match@v2.0.2
        if: ${{ github.event.inputs.version != '' }}
        id: regex-match
@@ -49,6 +49,14 @@ jobs:
          echo "branch_name=v${{steps.regex-match.outputs.group1}}" >> $GITHUB_OUTPUT
          echo "branch_exist=$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)" >> $GITHUB_OUTPUT

+      - name: Check input version is aligned with branch(main)
+        if: ${{ github.event.inputs.version != '' && steps.intermedia.outputs.branch_exist == '0' && !contains(github.event.inputs.version, 'pre') && !contains(steps.intermedia.outputs.short_ref, 'main') }}
+        run: |
+          echo "When you want to deliver a new new minor version, you might want to create a new branch first \
+          with naming convention v[major].[minor].x, and just run the workflow on that branch. \
+          Run the workflow on main only when needed"
+          exit 1
+
      - name: Checkout Actions
        uses: actions/checkout@v3
        with:
@@ -60,14 +68,8 @@ jobs:
          node-version: '16'
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run bump version (manually invoked)
        uses: ./actions/bump-version
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
@@ -11,7 +11,9 @@ on:
        description: Needs to match, exactly, the name of a milestone
        required: true
        type: string
-
+    secrets:
+      token:
+        required: true
 jobs:
  main:
    runs-on: ubuntu-latest
@@ -24,20 +26,14 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Close milestone (manually invoked)
        if: ${{ github.event.inputs.version != '' }}
        uses: ./actions/close-milestone
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
      - name: Close milestone (workflow invoked)
        if: ${{ inputs.version_call != '' }}
        uses: ./actions/close-milestone
        with:
          version_call: ${{ inputs.version_call }}
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.token }}
@@ -44,7 +44,7 @@ jobs:
      name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.20.6'
+        go-version: '1.20.4'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
@@ -1,58 +0,0 @@
-name: When an issue changes and it's part of the dashboards project, add the dashboards squad label
-on:
-  issues:
-    types: [opened, closed, edited, reopened, assigned, unassigned, labeled, unlabeled]
-      
-env:
-  GITHUB_TOKEN: ${{ secrets.ISSUE_COMMANDS_TOKEN }}
-  ORGANIZATION: ${{ github.repository_owner }}
-  REPO: ${{ github.event.repository.name }}
-  TARGET_PROJECT: 202
-  LABEL_IDs: "LA_kwDOAOaWjc8AAAABT38U-A"
-    
-concurrency:
-  group: issue-label-when-in-project-${{ github.event.number }}
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: log in
-        run: gh api user -q .login
-      - name: Check if issue is in target project
-        run: |
-          gh api graphql -f query='
-            query($org: String!, $repo: String!) {
-              repository(name: $repo, owner: $org) {
-                issue (number: ${{ github.event.issue.number }}) {
-                  id
-                  projectItems(first:20) {
-                    nodes {
-                      project {
-                        number,
-                      },
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -f repo=$REPO > projects_data.json
-          
-            echo 'IN_TARGET_PROJ='$(jq '.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.TARGET_PROJECT }}) | .project != null' projects_data.json) >> $GITHUB_ENV
-            echo 'ITEM_ID='$(jq '.data.repository.issue.id' projects_data.json) >> $GITHUB_ENV
-      - name: Set up label array
-        if: env.IN_TARGET_PROJ
-        run: |
-          IFS=',' read -ra LABEL_IDs <<< "${{ env.LABEL_IDs }}"
-          for item in "${LABEL_IDs[@]}"; do
-            echo "Item: $item"
-          done
-      - name: Add label to issue
-        if: env.IN_TARGET_PROJ
-        run: |
-          gh api graphql -f query='
-            mutation ($labelableId: ID!, $labelIds: [ID!]!) {
-              addLabelsToLabelable(
-                input: {labelableId: $labelableId, labelIds: $labelIds}
-              ) {
-                  clientMutationId
-              }
-            }' -f labelableId=$ITEM_ID -f labelIds=${{ env.LABEL_IDs }}
@@ -7,7 +7,7 @@ jobs:
  doc-validator:
    runs-on: "ubuntu-latest"
    container:
-      image: "grafana/doc-validator:v3.2.0"
+      image: "grafana/doc-validator:v3.0.0"
    steps:
      - name: "Checkout code"
        uses: "actions/checkout@v3"
@@ -1,81 +0,0 @@
-name: 'Ephemeral instances action'
-on:
-  issue_comment:
-    types: [created]
-  pull_request:
-      types: [opened, reopened, closed]
-jobs:      
-  handle-pull-request-event:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:        
-      - name: Get pull request repo
-        if: github.triggering_actor == 'PoorlyDefinedBehaviour'
-        uses: actions/github-script@v6
-        id: get-pull-request-repo
-        with:
-          result-encoding: string
-          script: |
-            if(context.payload.pull_request?.head.ref) {  
-              return context.payload.pull_request.head.ref
-            }
-
-            const response = await github.rest.pulls.get({
-              owner: "grafana",
-              repo: "grafana",
-              pull_number: context.payload.issue.number,
-            });
-            
-            return response.data.head.ref
-            
-      - name: Checkout Grafana
-        if: github.triggering_actor == 'PoorlyDefinedBehaviour'
-        uses: actions/checkout@v3
-        with:
-          repository: grafana/grafana
-          ref: ${{ steps.get-pull-request-repo.outputs.result }}
-          path: grafana
-
-      - name: Setup Go
-        if: github.triggering_actor == 'PoorlyDefinedBehaviour'
-        uses: actions/setup-go@v4
-        with:
-          go-version: '>=1.20'
-
-      - name: Generate a GitHub app installation token
-        if: github.triggering_actor == 'PoorlyDefinedBehaviour'
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.EI_APP_ID }}
-          private_key: ${{ secrets.EI_APP_PRIVATE_KEY }}
-
-      - name: Checkout ephemeral instances repository
-        uses: actions/checkout@v3  
-        with:
-          repository: grafana/ephemeral-grafana-instances-github-action
-          token: ${{ steps.generate_token.outputs.token }}
-          ref: main
-          path: ephemeral
-        
-      - name: Run action
-        if: github.triggering_actor == 'PoorlyDefinedBehaviour'
-        env:
-          GITHUB_EVENT: ${{ toJson(github.event)}}
-        run: |
-          GRAFANA_VERSION=10.1.0
-
-          cd $GITHUB_WORKSPACE/ephemeral/src
-          go run . \
-            -GITHUB_TOKEN="${{ steps.generate_token.outputs.token }}" \
-            -GITHUB_EVENT="$GITHUB_EVENT" \
-            -GITHUB_TRIGGERING_ACTOR="${{ github.triggering_actor }}" \
-            -GCOM_HOST="${{ secrets.EI_GCOM_HOST }}" \
-            -GCOM_TOKEN="${{ secrets.EI_GCOM_TOKEN }}" \
-            -HOSTED_GRAFANA_IMAGE_TAG="$GRAFANA_VERSION-ephemeral-grafana-${{ github.triggering_actor }}-${{ github.run_number }}-${{ github.run_attempt }}" \
-            -REGISTRY="${{ secrets.EI_EPHEMERAL_INSTANCES_REGISTRY }}" \
-            -GRAFANA_DIR="$GITHUB_WORKSPACE/grafana" \
-            -ENTERPRISE_REF="main" \
-            -GRAFANA_VERSION="$GRAFANA_VERSION" \
-            -GCP_SERVICE_ACCOUNT_KEY_BASE64="${{ secrets.EI_GCP_SERVICE_ACCOUNT_KEY_BASE64 }}" \
-            -EPHEMERAL_ORG_ID="${{ secrets.EI_EPHEMERAL_ORG_ID }}" || true
@@ -3,7 +3,7 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        required: true
+        required: true        
        description: Needs to match, exactly, the name of a milestone (NO v prefix)
 jobs:
  main:
@@ -14,17 +14,11 @@ jobs:
        with:
          repository: "grafana/grafana-github-actions"
          path: ./actions
-          ref: main
+          ref: main    
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run github release action
        uses: ./actions/github-release
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
@@ -10,10 +10,12 @@ jobs:
    uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
    with:
      version_call: ${{ github.event.inputs.version_input }}
-    secrets: inherit
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
  call-close-milestone:
    uses: grafana/grafana/.github/workflows/close-milestone.yml@main
    with:
      version_call: ${{ github.event.inputs.version_input }}
-    secrets: inherit
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
    needs: call-remove-milestone
@@ -23,7 +23,7 @@ jobs:
    - name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.20.6'
+        go-version: '1.20.4'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
@@ -1,24 +0,0 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo Ex: grafana/grafana
-name: Check for patch conflicts
-run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
-on:
-  pull_request_target:
-    types:
-      - opened
-    branches:
-      - "main"
-      - "v*.*.*"
-      - "release-*"
-
-# Since this is run on a pull request, we want to apply the patches intended for the
-# target branch onto the source branch, to verify compatibility before merging.
-jobs:
-  trigger_downstream_patch_check:
-    uses: grafana/security-patch-actions/.github/workflows/test-patches.yml@main
-    with:
-      src_repo: "${{ github.repository }}"
-      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
-      patch_repo: "${{ github.repository }}-security-patches"
-      patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main"
-    secrets: inherit
@@ -1,49 +0,0 @@
-name: "publish-kinds-next"
-
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - '**/*.cue'
-  workflow_dispatch:
-
-jobs:
-  main:
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-        with:
-          fetch-depth: 0
-
-      - name: "Setup Go"
-        uses: "actions/setup-go@v4"
-        with:
-          go-version: '1.20.6'
-
-      - name: "Verify kinds"
-        run: go run .github/workflows/scripts/kinds/verify-kinds.go
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-
-      - name: "Clone website-sync Action"
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafana-delivery-bot:${{ steps.generate_token.outputs.token }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to kind registry (next)"
-        uses: "./.github/actions/website-sync"
-        id: "publish-next"
-        with:
-          repository: "grafana/kind-registry"
-          branch: "main"
-          host: "github.com"
-          github_pat: "grafana-delivery-bot:${{ steps.generate_token.outputs.token }}"
-          source_folder: ".github/workflows/scripts/kinds/next"
-          target_folder: "grafana/next"
@@ -1,70 +0,0 @@
-name: "publish-kinds-release"
-
-on:
-  push:
-    branches:
-      - v[0-9]+.[0-9]+.x
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-    paths:
-      - '**/*.cue'
-  workflow_dispatch:
-
-jobs:
-  main:
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-        with:
-          fetch-depth: 0
-
-      - name: "Setup Go"
-        uses: "actions/setup-go@v4"
-        with:
-          go-version: '1.20.6'
-
-      - name: "Verify kinds"
-        run: go run .github/workflows/scripts/kinds/verify-kinds.go
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: "Checkout Actions library"
-        uses: "actions/checkout@v3"
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: "./actions"
-
-      - name: "Install Actions from library"
-        run: "npm install --production --prefix ./actions"
-
-      - name: "Determine if there is a matching release tag"
-        id: "has-matching-release-tag"
-        uses: "./actions/has-matching-release-tag"
-        with:
-          ref_name: "${{ github.ref_name }}"
-          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
-          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
-
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-
-      - name: "Clone website-sync Action"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafana-delivery-bot:${{ steps.generate_token.outputs.token }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to kind registry (release)"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./.github/actions/website-sync"
-        id: "publish-release"
-        with:
-          repository: "grafana/kind-registry"
-          branch: "main"
-          host: "github.com"
-          github_pat: "grafana-delivery-bot:${{ steps.generate_token.outputs.token }}"
-          source_folder: ".github/workflows/scripts/kinds/next"
-          target_folder: "grafana/${{ github.ref_name }}"
@@ -11,7 +11,9 @@ on:
        description: Needs to match, exactly, the name of a milestone
        required: true
        type: string
-
+    secrets:
+      token:
+        required: true
 jobs:
  main:
    runs-on: ubuntu-latest
@@ -24,20 +26,14 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Remove milestone from open issues (manually invoked)
        if: ${{ github.event.inputs.version != '' }}
        uses: ./actions/remove-milestone
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
      - name: Remove milestone from open issues (workflow invoked)
        if: ${{ inputs.version_call != '' }}
        uses: ./actions/remove-milestone
        with:
          version_call: ${{ inputs.version_call }}
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.token }}
@@ -14,7 +14,7 @@ jobs:
      uses: actions/checkout@v2
        
    - name: Anchore SBOM Action
-      uses: anchore/sbom-action@v0.14.2
+      uses: anchore/sbom-action@v0.13.4
      with:
         artifact-name: ${{ github.event.repository.name }}-spdx.json

@@ -1,7 +1,7 @@
 module.exports = async ({ core, filePath }) => {
    try {
        const fs = require('fs').promises;
-        const content = await fs.readFile(filePath)
+        const content = await fs.readFile(filepath)
        const result = JSON.parse(content);
    
        core.startGroup('Parsing json file...');
@@ -13,6 +13,6 @@ module.exports = async ({ core, filePath }) => {

        core.endGroup();
    } catch (error) {
-        core.setFailed(error.message);
+        core.restFailed(error.message);
    }
 }
@@ -1,416 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing/fstest"
-
-	"cuelang.org/go/cue"
-	cueformat "cuelang.org/go/cue/format"
-	"github.com/google/go-github/github"
-	"github.com/grafana/codejen"
-	"github.com/grafana/grafana/pkg/codegen"
-	"github.com/grafana/grafana/pkg/cuectx"
-	"github.com/grafana/grafana/pkg/plugins/pfs"
-	"github.com/grafana/grafana/pkg/plugins/pfs/corelist"
-	"github.com/grafana/grafana/pkg/registry/corekind"
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"golang.org/x/oauth2"
-)
-
-const (
-	GITHUB_OWNER = "grafana"
-	GITHUB_REPO  = "kind-registry"
-)
-
-// main This script verifies that stable kinds are not updated once published (new schemas
-// can be added but existing ones cannot be updated).
-// If the env variable CODEGEN_VERIFY is not present, this also generates kind files into a
-// local "next" folder, ready to be published in the kind-registry repo.
-// If kind names are given as parameters, the script will make the above actions only for the
-// given kinds.
-func main() {
-	var kindArgs []string
-	if len(os.Args) > 1 {
-		kindArgs = os.Args[1:]
-	}
-
-	var corek []kindsys.Kind
-	var compok []kindsys.Composable
-
-	// This script will reach the GH API rate limit if ran for all kinds without token.
-	// If you don't have a GH token, run the script with kind names as parameters to run
-	// it only for a limited set of kinds.
-	var ts oauth2.TokenSource
-	token, ok := os.LookupEnv("GITHUB_TOKEN")
-	if ok {
-		ts = oauth2.StaticTokenSource(
-			&oauth2.Token{AccessToken: token},
-		)
-	}
-
-	ctx := context.Background()
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
-
-	// Search for the latest version directory present in the kind-registry repo
-	latestRegistryDir, err := findLatestDir(ctx, client)
-	if err != nil {
-		die(fmt.Errorf("failed to get latest directory for published kinds: %s", err))
-	}
-
-	errs := make([]error, 0)
-
-	// Kind verification
-	for _, kind := range corekind.NewBase(nil).All() {
-		if len(kindArgs) > 0 && !contains(kindArgs, kind.Name()) {
-			continue
-		}
-
-		name := kind.Props().Common().MachineName
-		err := verifyKind(kind, name, "core", latestRegistryDir)
-		if err != nil {
-			errs = append(errs, err)
-			continue
-		}
-
-		corek = append(corek, kind)
-	}
-
-	for _, pp := range corelist.New(nil) {
-		// ElasticSearch composable kind causes the CUE evaluator to hand
-		// see https://github.com/grafana/grafana/pull/68034#discussion_r1187800059
-		if pp.Properties.Id == "elasticsearch" {
-			continue
-		}
-
-		for _, kind := range pp.ComposableKinds {
-			if len(kindArgs) > 0 && !contains(kindArgs, kind.Name()) {
-				continue
-			}
-
-			si, err := kindsys.FindSchemaInterface(kind.Def().Properties.SchemaInterface)
-			if err != nil {
-				errs = append(errs, err)
-				continue
-			}
-
-			name := strings.ToLower(fmt.Sprintf("%s/%s", strings.TrimSuffix(kind.Lineage().Name(), si.Name()), si.Name()))
-			err = verifyKind(kind, name, "composable", latestRegistryDir)
-			if err != nil {
-				errs = append(errs, err)
-				continue
-			}
-
-			compok = append(compok, kind)
-		}
-	}
-
-	die(errs...)
-
-	if _, set := os.LookupEnv("CODEGEN_VERIFY"); set {
-		os.Exit(0)
-	}
-
-	// File generation
-	jfs := codejen.NewFS()
-	registryPath := filepath.Join(".github", "workflows", "scripts", "kinds")
-
-	coreJennies := codejen.JennyList[kindsys.Kind]{}
-	coreJennies.Append(
-		KindRegistryJenny(registryPath, kindArgs),
-	)
-	corefs, err := coreJennies.GenerateFS(corek...)
-	die(err)
-	die(jfs.Merge(corefs))
-
-	composableJennies := codejen.JennyList[kindsys.Composable]{}
-	composableJennies.Append(
-		ComposableKindRegistryJenny(registryPath, kindArgs),
-	)
-	composablefs, err := composableJennies.GenerateFS(compok...)
-	die(err)
-	die(jfs.Merge(composablefs))
-
-	if err = jfs.Write(context.Background(), ""); err != nil {
-		die(fmt.Errorf("error while writing generated code to disk:\n%s", err))
-	}
-}
-
-func die(errs ...error) {
-	if len(errs) > 0 && errs[0] != nil {
-		for _, err := range errs {
-			fmt.Fprint(os.Stderr, err, "\n")
-		}
-		fmt.Println("Run `go run verify-kinds.go <kind name> <kind name>` to run the script on a limited set of kinds.")
-		os.Exit(1)
-	}
-}
-
-// verifyKind verifies that stable kinds are not updated once published (new schemas
-// can be added but existing ones cannot be updated)
-func verifyKind(kind kindsys.Kind, name string, category string, latestRegistryDir string) error {
-	oldKindString, err := getPublishedKind(name, category, latestRegistryDir)
-	if err != nil {
-		return err
-	}
-
-	var oldKind kindsys.Kind
-	if oldKindString != "" {
-		switch category {
-		case "core":
-			oldKind, err = loadCoreKind(name, oldKindString)
-		case "composable":
-			oldKind, err = loadComposableKind(name, oldKindString)
-		default:
-			return fmt.Errorf("kind can only be core or composable")
-		}
-	}
-	if err != nil {
-		return err
-	}
-
-	// Kind is new - no need to compare it
-	if oldKind == nil {
-		return nil
-	}
-
-	// Check that maturity isn't downgraded
-	if kind.Maturity().Less(oldKind.Maturity()) {
-		return fmt.Errorf("kind maturity can't be downgraded once a kind is published")
-	}
-
-	if oldKind.Maturity().Less(kindsys.MaturityStable) {
-		return nil
-	}
-
-	// Check that old schemas do not contain updates
-	err = thema.IsAppendOnly(oldKind.Lineage(), kind.Lineage())
-	if err != nil {
-		return fmt.Errorf("existing schemas in lineage %s cannot be modified: %w", name, err)
-	}
-
-	return nil
-}
-
-// getPublishedKind retrieves the latest published kind from the kind registry
-func getPublishedKind(name string, category string, latestRegistryDir string) (string, error) {
-	var ts oauth2.TokenSource
-	token, ok := os.LookupEnv("GITHUB_TOKEN")
-	if ok {
-		ts = oauth2.StaticTokenSource(
-			&oauth2.Token{AccessToken: token},
-		)
-	}
-
-	ctx := context.Background()
-	tc := oauth2.NewClient(ctx, ts)
-	client := github.NewClient(tc)
-
-	if latestRegistryDir == "" {
-		return "", nil
-	}
-
-	file, _, resp, err := client.Repositories.GetContents(ctx, GITHUB_OWNER, GITHUB_REPO, fmt.Sprintf("grafana/%s/%s/%s.cue", latestRegistryDir, category, name), nil)
-	if err != nil {
-		if resp.StatusCode == http.StatusNotFound {
-			return "", nil
-		}
-		return "", fmt.Errorf("error retrieving published kind from GH, %d: %w", resp.StatusCode, err)
-	}
-	content, err := file.GetContent()
-	if err != nil {
-		return "", fmt.Errorf("error decoding published kind content: %w", err)
-	}
-
-	return content, nil
-}
-
-// findLatestDir get the latest version directory published in the kind registry
-func findLatestDir(ctx context.Context, client *github.Client) (string, error) {
-	re := regexp.MustCompile(`([0-9]+)\.([0-9]+)\.([0-9]+)`)
-	latestVersion := []uint64{0, 0, 0}
-	latestDir := ""
-
-	_, dir, resp, err := client.Repositories.GetContents(ctx, GITHUB_OWNER, GITHUB_REPO, "grafana", nil)
-	if err != nil {
-		if resp.StatusCode == http.StatusNotFound {
-			return "", nil
-		}
-		return "", err
-	}
-
-	for _, content := range dir {
-		if content.GetType() != "dir" {
-			continue
-		}
-
-		parts := re.FindStringSubmatch(content.GetName())
-		if parts == nil || len(parts) < 4 {
-			continue
-		}
-
-		version := make([]uint64, len(parts)-1)
-		for i := 1; i < len(parts); i++ {
-			version[i-1], _ = strconv.ParseUint(parts[i], 10, 32)
-		}
-
-		if isLess(latestVersion, version) {
-			latestVersion = version
-			latestDir = content.GetName()
-		}
-	}
-
-	return latestDir, nil
-}
-
-func isLess(v1 []uint64, v2 []uint64) bool {
-	if len(v1) == 1 || len(v2) == 1 {
-		return v1[0] < v2[0]
-	}
-
-	return v1[0] < v2[0] || (v1[0] == v2[0] && isLess(v1[2:], v2[2:]))
-}
-
-func loadCoreKind(name string, kind string) (kindsys.Kind, error) {
-	fs := fstest.MapFS{
-		fmt.Sprintf("%s.cue", name): &fstest.MapFile{
-			Data: []byte(kind),
-		},
-	}
-
-	rt := cuectx.GrafanaThemaRuntime()
-
-	def, err := cuectx.LoadCoreKindDef(fmt.Sprintf("%s.cue", name), rt.Context(), fs)
-	if err != nil {
-		return nil, fmt.Errorf("%s is not a valid kind: %w", name, err)
-	}
-
-	return kindsys.BindCore(rt, def)
-}
-
-func loadComposableKind(name string, kind string) (kindsys.Kind, error) {
-	parts := strings.Split(name, "/")
-	if len(parts) > 1 {
-		name = parts[1]
-	}
-
-	fs := fstest.MapFS{
-		fmt.Sprintf("%s.cue", name): &fstest.MapFile{
-			Data: []byte("package grafanaplugin\n" + kind),
-		},
-	}
-
-	rt := cuectx.GrafanaThemaRuntime()
-
-	def, err := pfs.LoadComposableKindDef(fs, rt, fmt.Sprintf("%s.cue", name))
-	if err != nil {
-		return nil, fmt.Errorf("%s is not a valid kind: %w", name, err)
-	}
-
-	return kindsys.BindComposable(rt, def)
-}
-
-// KindRegistryJenny generates kind files into the "next" folder of the local kind registry.
-func KindRegistryJenny(path string, kindSet []string) codegen.OneToOne {
-	return &kindregjenny{
-		path:    path,
-		kindSet: kindSet,
-	}
-}
-
-type kindregjenny struct {
-	path    string
-	kindSet []string
-}
-
-func (j *kindregjenny) JennyName() string {
-	return "KindRegistryJenny"
-}
-
-func (j *kindregjenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	if len(j.kindSet) > 0 && !contains(j.kindSet, kind.Name()) {
-		return nil, nil
-	}
-
-	name := kind.Props().Common().MachineName
-	core, ok := kind.(kindsys.Core)
-	if !ok {
-		return nil, fmt.Errorf("kind sent to KindRegistryJenny must be a core kind")
-	}
-
-	newKindBytes, err := kindToBytes(core.Def().V)
-	if err != nil {
-		return nil, err
-	}
-
-	path := filepath.Join(j.path, "next", "core", name, name+".cue")
-	return codejen.NewFile(path, newKindBytes, j), nil
-}
-
-// kindToBytes converts a kind cue value to a .cue file content
-func kindToBytes(kind cue.Value) ([]byte, error) {
-	node := kind.Syntax(
-		cue.All(),
-		cue.Schema(),
-		cue.Docs(true),
-	)
-
-	return cueformat.Node(node)
-}
-
-// ComposableKindRegistryJenny generates kind files into the "next" folder of the local kind registry.
-func ComposableKindRegistryJenny(path string, kindSet []string) codejen.OneToOne[kindsys.Composable] {
-	return &ckrJenny{
-		path:    path,
-		kindSet: kindSet,
-	}
-}
-
-type ckrJenny struct {
-	path    string
-	kindSet []string
-}
-
-func (j *ckrJenny) JennyName() string {
-	return "ComposableKindRegistryJenny"
-}
-
-func (j *ckrJenny) Generate(k kindsys.Composable) (*codejen.File, error) {
-	if len(j.kindSet) > 0 && !contains(j.kindSet, k.Name()) {
-		return nil, nil
-	}
-
-	si, err := kindsys.FindSchemaInterface(k.Def().Properties.SchemaInterface)
-	if err != nil {
-		panic(err)
-	}
-
-	name := strings.ToLower(fmt.Sprintf("%s/%s", strings.TrimSuffix(k.Lineage().Name(), si.Name()), si.Name()))
-
-	newKindBytes, err := kindToBytes(k.Def().V)
-	if err != nil {
-		return nil, err
-	}
-
-	newKindBytes = []byte(fmt.Sprintf("package kind\n\n%s", newKindBytes))
-
-	return codejen.NewFile(filepath.Join(j.path, "next", "composable", name+".cue"), newKindBytes, j), nil
-}
-
-func contains(array []string, value string) bool {
-	for _, v := range array {
-		if v == value {
-			return true
-		}
-	}
-
-	return false
-}
@@ -1,25 +0,0 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo, Ex: grafana/grafana
-name: Sync to mirror
-run-name: sync-to-mirror-${{ github.base_ref }}-${{ github.head_ref }}
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-      - "v*.*.*"
-      - "release-*"
-
-# This is run after the pull request has been merged, so we'll run against the target branch
-jobs:
-  trigger_downstream_patch_mirror:
-    concurrency: patch-mirror-${{ github.ref }}
-    uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main
-    if: github.repository == 'grafana/grafana'
-    with:
-      ref: "${{ github.ref_name }}" # this is the target branch name, Ex: "main"
-      src_repo: "${{ github.repository }}"
-      dest_repo: "${{ github.repository }}-security-mirror"
-      patch_repo: "${{ github.repository }}-security-patches"
-    secrets: inherit
-
@@ -15,16 +15,10 @@ jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run update changelog (manually invoked)
        uses: grafana/grafana-github-actions-go/update-changelog@main
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
          version: ${{ inputs.version }}
          metrics_api_key: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
          community_api_key: ${{ secrets.GRAFANABOT_FORUM_KEY }}
@@ -1,27 +0,0 @@
-name: Update `make docs` procedure
-on:
-  schedule:
-    - cron: '0 7 * * 1-5'
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Update procedure
-        if: github.repository != 'grafana/writers-toolkit'
-        run: |
-          curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
-          curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs
-          if git diff --exit-code; then exit 0; fi
-          BRANCH="$(date +%Y-%m-%d)/update-make-docs"
-          git checkout -b "${BRANCH}"
-          git add .
-          git config --local user.email "bot@grafana.com"
-          git config --local user.name "grafanabot"
-          git commit -m "Update \`make docs\` procedure"
-          git push -v origin "refs/heads/${BRANCH}"
-          gh pr create --fill
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,27 +0,0 @@
-name: "verify-kinds"
-
-on:
-  pull_request:
-    branches: [ main ]
-    paths:
-    - '**/*.cue'
-
-jobs:
-  main:
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-        with:
-          fetch-depth: 0
-
-      - name: "Setup Go"
-        uses: "actions/setup-go@v4"
-        with:
-          go-version: '1.20.6'
-
-      - name: "Verify kinds"
-        run: go run .github/workflows/scripts/kinds/verify-kinds.go
-        env:
-          CODEGEN_VERIFY: 1
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -191,6 +191,3 @@ public/api-spec.json
 deployment_tools_config.json

 .betterer.cache
-
-# Temporary file for backporting PRs
-.pr-body.txt
@@ -1,6 +1,6 @@
 {
  "name": "eslint",
-  "version": "8.44.0-sdk",
+  "version": "8.34.0-sdk",
  "main": "./lib/api.js",
  "type": "commonjs"
 }
@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai

 ## Attribution

-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4/code-of-conduct][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

-[homepage]: https://contributor-covenant.org
-[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
@@ -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.6-alpine3.17
+ARG GO_IMAGE=golang:1.20.4-alpine3.17

 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
@@ -13,6 +13,7 @@ GO = go
 GO_FILES ?= ./pkg/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
+GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))

 targets := $(shell echo '$(sources)' | tr "," " ")
@@ -74,7 +75,7 @@ gen-cue: ## Do all CUE/Thema code generation
 	go generate ./pkg/plugins/plugindef
 	go generate ./kinds/gen.go
 	go generate ./public/app/plugins/gen.go
-	go generate ./pkg/kindsysreport/codegen/report.go
+	go generate ./pkg/kindsys/report.go

 gen-go: $(WIRE)
 	@echo "generate go files"
@@ -206,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.6 \
+	--build-arg GO_IMAGE=golang:1.20.4 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)

@@ -42,8 +42,6 @@ If you're interested in contributing to the Grafana project:
 - If you have a specific question, check out our [discussion forums](https://community.grafana.com/).
 - For general discussions, join us on the [official Slack](https://slack.grafana.com) team.

-This project is tested with [BrowserStack](https://www.browserstack.com/)
-
 ## License

 Grafana is distributed under [AGPL-3.0-only](LICENSE). For Apache-2.0 exceptions, see [LICENSING.md](https://github.com/grafana/grafana/blob/HEAD/LICENSING.md).
@@ -1,16 +1,12 @@
 # Reporting security issues

-This product is in scope for our Bug Bounty Program. To submit a vulnerability report, please visit [Grafana Labs Bug Bounty Policy page](https://github.com/grafana/bugbounty) and follow the instructions provided. Our security team will review your submission and get back to you as soon as possible.
-
---
-
-For any other security issues, please send an email to security@grafana.com
+If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address.

 Please encrypt your message to us; please use our PGP key. The key fingerprint is:

-225E 6A9B BB15 A37E 95EB 6312 C66A 51CC B44C 27E0
+F988 7BEA 027A 049F AE8E 5CAA D125 8932 BE24 C5CA

-The key is available from [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=0x225E6A9BBB15A37E95EB6312C66A51CCB44C27E0&fingerprint=on&op=index).
+The key is available from [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA&fingerprint=on&op=index).

 Grafana Labs will send you a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.

@@ -378,9 +378,6 @@ angular_support_enabled = true
 # The CSRF check will be executed even if the request has no login cookie.
 csrf_always_check = false

-# Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
-disable_frontend_sandbox_for_plugins =
-
 [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.
@@ -559,9 +556,6 @@ sigv4_verbose_logging = false
 # Set to true to enable Azure authentication option for HTTP-based datasources
 azure_auth_enabled = false

-# Use email lookup in addition to the unique ID provided by the IdP
-oauth_allow_insecure_email_lookup = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -595,13 +589,10 @@ allowed_organizations =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
-skip_org_role_sync = false
 tls_skip_verify_insecure = false
 tls_client_cert =
 tls_client_key =
 tls_client_ca =
-# GitHub OAuth apps does not provide refresh tokens and the access tokens never expires.
-use_refresh_token = false

 #################################### GitLab Auth #########################
 [auth.gitlab]
@@ -627,7 +618,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
-use_refresh_token = true

 #################################### Google Auth #########################
 [auth.google]
@@ -638,10 +628,10 @@ allow_sign_up = true
 auto_login = false
 client_id = some_client_id
 client_secret =
-scopes = openid email profile
-auth_url = https://accounts.google.com/o/oauth2/v2/auth
-token_url = https://oauth2.googleapis.com/token
-api_url = https://openidconnect.googleapis.com/v1/userinfo
+scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+auth_url = https://accounts.google.com/o/oauth2/auth
+token_url = https://accounts.google.com/o/oauth2/token
+api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
 hosted_domain =
 skip_org_role_sync = false
@@ -650,7 +640,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
-use_refresh_token = true

 #################################### Grafana.com Auth ####################
 # legacy key names (so they work in env variables)
@@ -661,7 +650,6 @@ client_id = some_id
 client_secret =
 scopes = user:email
 allowed_organizations =
-use_refresh_token = false

 [auth.grafana_com]
 name = Grafana.com
@@ -674,7 +662,6 @@ client_secret =
 scopes = user:email
 allowed_organizations =
 skip_org_role_sync = false
-use_refresh_token = false

 #################################### Azure AD OAuth #######################
 [auth.azuread]
@@ -690,7 +677,6 @@ auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
 allowed_domains =
 allowed_groups =
-allowed_organizations =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
 force_use_graph_api = false
@@ -699,8 +685,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
-skip_org_role_sync = false
-use_refresh_token = true

 #################################### Okta OAuth #######################
 [auth.okta]
@@ -726,7 +710,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
-use_refresh_token = false

 #################################### Generic OAuth #######################
 [auth.generic_oauth]
@@ -764,7 +747,6 @@ use_pkce = false
 auth_style =
 allow_assign_grafana_admin = false
 skip_org_role_sync = false
-use_refresh_token = false

 #################################### Basic Auth ##########################
 [auth.basic]
@@ -900,9 +882,6 @@ level = info
 # optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
 filters =

-# Set the default error message shown to users. This message is displayed instead of sensitive backend errors which should be obfuscated.
-user_facing_default_error = "please inspect Grafana server log for details"
-
 # For "console" mode only
 [log.console]
 level =
@@ -1100,11 +1079,6 @@ max_attempts = 3
 # 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.
 min_interval = 10s

-# This is an experimental option to add parallelization to saving alert states in the database.
-# It configures the maximum number of concurrent queries per rule evaluated. The default value is 1
-# (concurrent queries per rule disabled).
-max_state_save_concurrency = 1
-
 [unified_alerting.screenshots]
 # Enable screenshots in notifications. You must have either installed the Grafana image rendering
 # plugin, or set up Grafana to use a remote rendering service.
@@ -1272,11 +1246,6 @@ enabled = true
 # Enable the news feed section
 news_feed_enabled = true

-#################################### Query #############################
-[query]
-# Set the number of data source queries that can be executed concurrently in mixed queries. Default is the number of CPUs.
-concurrent_query_limit = 
-
 #################################### Query History #############################
 [query_history]
 # Enable the Query history
@@ -1430,11 +1399,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
-# Disable download of the public key for verifying plugin signature.
-public_key_retrieval_disabled = false
-# Force download of the public key for verifying plugin signature on startup. If disabled, the public key will be retrieved every 10 days.
-# Requires public_key_retrieval_disabled to be false to have any effect.
-public_key_retrieval_on_startup = false
+# Force download of public key for verifying plugin signature on startup.
+enforce_public_key_download = false

 #################################### Grafana Live ##########################################
 [live]
@@ -384,9 +384,6 @@
 # The CSRF check will be executed even if the request has no login cookie.
 ;csrf_always_check = false

-# Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
-;disable_frontend_sandbox_for_plugins =
-
 [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.
@@ -548,9 +545,6 @@
 # Set to skip the organization role from JWT login and use system's role assignment instead.
 ; skip_org_role_sync = false

-# Use email lookup in addition to the unique ID provided by the IdP
-;oauth_allow_insecure_email_lookup = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -584,7 +578,6 @@
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
-;skip_org_role_sync = false

 #################################### GitLab Auth #########################
 [auth.gitlab]
@@ -620,10 +613,10 @@
 ;auto_login = false
 ;client_id = some_client_id
 ;client_secret = some_client_secret
-;scopes = openid email profile
-;auth_url = https://accounts.google.com/o/oauth2/v2/auth
-;token_url = https://oauth2.googleapis.com/token
-;api_url = https://openidconnect.googleapis.com/v1/userinfo
+;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+;auth_url = https://accounts.google.com/o/oauth2/auth
+;token_url = https://accounts.google.com/o/oauth2/token
+;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;allowed_domains =
 ;hosted_domain =
 ;skip_org_role_sync = false
@@ -656,7 +649,6 @@
 ;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
 ;allowed_domains =
 ;allowed_groups =
-;allowed_organizations =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
 ;use_pkce = true
@@ -850,9 +842,6 @@
 # optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
 ;filters =

-# Set the default error message shown to users. This message is displayed instead of sensitive backend errors which should be obfuscated. Default is the same as the sample value.
-;user_facing_default_error = "please inspect Grafana server log for details"
-
 # For "console" mode only
 [log.console]
 ;level =
@@ -1189,11 +1178,6 @@
 # Enable the news feed section
 ; news_feed_enabled = true

-#################################### Query #############################
-[query]
-# Set the number of data source queries that can be executed concurrently in mixed queries. Default is the number of CPUs.
-;concurrent_query_limit =
-
 #################################### Query History #############################
 [query_history]
 # Enable the Query history
@@ -1342,11 +1326,8 @@
 ;plugin_catalog_hidden_plugins =
 # Log all backend requests for core and external plugins.
 ;log_backend_requests = false
-# Disable download of the public key for verifying plugin signature.
-; public_key_retrieval_disabled = false
-# Force download of the public key for verifying plugin signature on startup. If disabled, the public key will be retrieved every 10 days.
-# Requires public_key_retrieval_disabled to be false to have any effect.
-; public_key_retrieval_on_startup = false
+# Force download of public key for verifying plugin signature on startup.
+;enforce_public_key_download = false

 #################################### Grafana Live ##########################################
 [live]
@@ -1493,13 +1474,13 @@

 # Move an app plugin referenced by its id (including all its pages) to a specific navigation section
 [navigation.app_sections]
-# The following will move an app plugin with the id of `my-app-id` under the `cfg` section
-# my-app-id = cfg
+# The following will move an app plugin with the id of `my-app-id` under the `starred` section
+# my-app-id = admin

 # Move a specific app plugin page (referenced by its `path` field) to a specific navigation section
 [navigation.app_standalone_pages]
-# The following will move the page with the path "/a/my-app-id/my-page" from `my-app-id` to the `cfg` section
-# /a/my-app-id/my-page = cfg
+# The following will move the page with the path "/a/my-app-id/starred-content" from `my-app-id` to the `starred` section
+# /a/my-app-id/starred-content = starred

 #################################### Secure Socks5 Datasource Proxy #####################################
 [secure_socks_datasource_proxy]
@@ -7,7 +7,6 @@ This directory contains guides for contributors to the Grafana project.
 - [Developer guide](developer-guide.md)
 - [Triage issues](triage-issues.md)
 - [Merge a pull request](merge-pull-request.md)
- [Making changes to the CI pipeline](drone-pipeline.md)

 The `style-guides` directory contains style guides for the Grafana software project and documentation.

@@ -1,17 +0,0 @@
-# Making changes to the Drone pipeline
-
-_Only people in the Grafana organization can make changes to the Drone pipeline_
-
-The Drone pipelines are built with [Starlark](https://github.com/bazelbuild/starlark), a language which is similar to Python. The Starlark files are located in [`scripts/drone`](https://github.com/grafana/grafana/tree/main/scripts/drone).
-
-## Setup
-
- Set environment variables `DRONE_SERVER` and `DRONE_TOKEN`, which can be found on your [Drone account](https://drone.grafana.net/account). These are used to verify that only Grafana employees can make changes to the pipelines.
- Install [buildifier](https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md), and use it to format the Starlark files you edit.
-
-## Develop
-
- Open a PR where you can do test runs for your changes. If you need to experiment with secrets, create a PR in the [grafana-ci-sandbox repo](https://github.com/grafana/grafana-ci-sandbox), before opening a PR in the main repo.
- Run `make drone` after making changes to the Starlark files. This builds the `.drone.yml` file.
-
-For further questions, reach out to the grafana-delivery squad.
@@ -9,7 +9,7 @@ Grafana uses the [i18next](https://www.i18next.com/) framework for managing tran
 - Use `<Trans i18nKey="search-results.panel-link">Go to {{ pageTitle }}</Trans>` in code to add a translatable phrase
 - Translations are stored in JSON files in `public/locales/{locale}/grafana.json`
 - If a particular phrase is not available in the a language then it will fall back to English
- To update phrases in English, edit the default phrase in both the component's source and the [English grafana.json message catalogue](../public/locales/en-US/grafana.json), then run `yarn i18n:extract`.
+- To update phrases in English, edit the default phrase in the component's source, then run `yarn i18n:extract`. Do not edit the `en-ES/grafana.json` or update the english phrase in Crowdin
 - To update phrases in any translated language, edit the phrase in Crowdin. Do not edit the `{locale}/grafana.json`

 ## How to add a new translation phrase
@@ -80,7 +80,7 @@ Grafana uses the [i18next](https://www.i18next.com/) framework for managing tran
 - Extracts phrases into messages catalogues for translating in external systems
 - Manages the user's locale and putting the translated phrases in the UI

-Grafana will load the message catalogue JSON before the initial render.
+English phrases remain in our Javascript bundle in the source components (as the `<Trans />` or `t()` default phrase). At runtime, we don't need to load any messages for en-US. If the user's language preference is set to another language, Grafana will load that translations's messages JSON before the initial render.

 ### Phrase ID naming convention

@@ -162,32 +162,17 @@ import { Trans } from "app/core/internationalization"

 ### Plurals

-Plurals require special handling to make sure they can be translating according to the rules of each locale (which may be more complex that you think!). Use either the `<Trans />` component or the `t` function, with the `count` prop to provide a singular form.
+Plurals require special handling to make sure they can be translating according to the rules of each locale (which may be more complex that you think!). Use the `<Trans />` component, with the `count` prop.

 ```js
 import { Trans } from 'app/core/internationalization';

-<Trans i18nKey="inbox.heading" count={messages.length}>
-  You got {{ count: messages.length }} message
+<Trans i18nKey="newMessages" count={messages.length}>
+  You got {{ count: messages.length }} messages.
 </Trans>;
 ```

-```js
-import { t } from 'app/core/internationalization';
-
-const translatedString = t('inbox.heading', 'You got {{count}} message', { count: messages.length });
-```
-
-Once extracted with `yarn i18n:extract` you will need to manually edit the [English grafana.json message catalogue](../public/locales/en-US/grafana.json) to correct the plural forms. See the [react-i18next docs](https://react.i18next.com/latest/trans-component#plural) for more details.
-
-```json
-{
-  "inbox": {
-    "heading__one": "You got {{count}} message",
-    "heading__other": "You got {{count}} messages"
-  }
-}
-```
+Once extracted with `yarn i18n:extract` you will need to manually fill in the grafana.json message catalogues with the additional plural forms. See the [react-i18next docs](https://react.i18next.com/latest/trans-component#plural) for more details.

 ## Documentation

@@ -44,10 +44,7 @@ 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.
-For every major and minor release there is a milestone ending with `.x` (e.g. `10.0.x` for the 10.0.x releases).
-PRs targetting `main` should use the `.x` milestone of the next minor (or major) version (you can find that version number inside the `package.json` file).
-Backport PRs should use the version of the target branch (e.g. `9.4.x` for the `v9.4.x` branch).
+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?

@@ -39,9 +39,8 @@ can have your getStyles function return an object with many class names and use
 Let's say you need to style a component that has a different background depending on the `isActive` property :

 ```tsx
-import { css, cx } from '@emotion/css';
 import React from 'react';
-
+import { css, cx } from '@emotion/css';
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';

@@ -50,7 +49,8 @@ interface ComponentAProps {
 }

 const ComponentA = ({ isActive }: ComponentAProps) => {
-  const styles = useStyles2(getStyles);
+  const theme = useTheme();
+  const styles = useStyles2(theme);

  return (
    <div className={cx(styles.wrapper, isActive && styles.active)}>
@@ -64,15 +64,15 @@ const ComponentA = ({ isActive }: ComponentAProps) => {
 const getStyles = (theme: GrafanaTheme2) => {
  return {
    wrapper: css({
-      background: theme.colors.background.secondary,
+      background: theme.colors.background.secondary;
    }),
    active: css({
      background: theme.colors.primary.main,
      text: theme.colors.primary.contrastText,
-    }),
+    },
    icon: css({
-      fontSize: theme.typography.bodySmall.fontSize,
-    }),
+      fontSize: theme.typography.bodySmall.fontSize;
+    })
  };
 };
 ```
@@ -56,15 +56,11 @@ datasources:
    type: prometheus
    access: proxy
    url: http://localhost:9090
-    basicAuth: true #username: admin, password: admin
-    basicAuthUser: admin
    jsonData:
      manageAlerts: true
      alertmanagerUid: gdev-alertmanager
      prometheusType: Prometheus #Cortex | Mimir | Prometheus | Thanos
      prometheusVersion: 2.40.0
-    secureJsonData:
-      basicAuthPassword: admin #https://grafana.com/docs/grafana/latest/administration/provisioning/#using-environment-variables

  - name: gdev-slow-prometheus
    uid: gdev-slow-prometheus-uid
@@ -440,10 +440,6 @@
            {
              "text": "Vietnamese Dong (VND)",
              "value": "currencyVND"
-            },
-            {
-              "text": "Turkish Lira (₺)",
-              "value": "currencyTRY"
            }
          ],
          "text": "currency"
@@ -644,10 +640,6 @@
        },
        {
          "submenu": [
-            {
-              "text": "counts/sec (cps)",
-              "value": "cps"
-            },
            {
              "text": "ops/sec (ops)",
              "value": "ops"
@@ -668,34 +660,10 @@
              "text": "I/O ops/sec (iops)",
              "value": "iops"
            },
-            {
-              "text": "events/sec (eps)",
-              "value": "eps"
-            },
-            {
-              "text": "messages/sec (mps)",
-              "value": "mps"
-            },
-            {
-              "text": "records/sec (rps)",
-              "value": "recps"
-            },
-            {
-              "text": "rows/sec (rps)",
-              "value": "rowsps"
-            },
-            {
-              "text": "counts/min (cpm)",
-              "value": "cpm"
-            },
            {
              "text": "ops/min (opm)",
              "value": "opm"
            },
-            {
-              "text": "requests/min (rpm)",
-              "value": "reqpm"
-            },
            {
              "text": "reads/min (rpm)",
              "value": "rpm"
@@ -703,22 +671,6 @@
            {
              "text": "writes/min (wpm)",
              "value": "wpm"
-            },
-            {
-              "text": "events/min (epm)",
-              "value": "epm"
-            },
-            {
-              "text": "messages/min (mpm)",
-              "value": "mpm"
-            },
-            {
-              "text": "records/min (rpm)",
-              "value": "recpm"
-            },
-            {
-              "text": "rows/min (rpm)",
-              "value": "rowspm"
            }
          ],
          "text": "throughput"
@@ -1,77 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "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"
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 8,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "flame_graph"
-        }
-      ],
-      "title": "Flame Graph",
-      "type": "flamegraph"
-    }
-  ],
-  "refresh": "",
-  "revision": 1,
-  "schemaVersion": 38,
-  "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Panel Tests - Flame Graph",
-  "uid": "16f11TZWk",
-  "version": 7,
-  "weekStart": ""
-}
@@ -440,10 +440,6 @@
            {
              "text": "Vietnamese Dong (VND)",
              "value": "currencyVND"
-            },
-            {
-              "text": "Turkish Lira (₺)",
-              "value": "currencyTRY"
            }
          ],
          "text": "currency"
@@ -644,10 +640,6 @@
        },
        {
          "submenu": [
-            {
-              "text": "counts/sec (cps)",
-              "value": "cps"
-            },
            {
              "text": "ops/sec (ops)",
              "value": "ops"
@@ -668,34 +660,10 @@
              "text": "I/O ops/sec (iops)",
              "value": "iops"
            },
-            {
-              "text": "events/sec (eps)",
-              "value": "eps"
-            },
-            {
-              "text": "messages/sec (mps)",
-              "value": "mps"
-            },
-            {
-              "text": "records/sec (rps)",
-              "value": "recps"
-            },
-            {
-              "text": "rows/sec (rps)",
-              "value": "rowsps"
-            },
-            {
-              "text": "counts/min (cpm)",
-              "value": "cpm"
-            },
            {
              "text": "ops/min (opm)",
              "value": "opm"
            },
-            {
-              "text": "requests/min (rpm)",
-              "value": "reqpm"
-            },
            {
              "text": "reads/min (rpm)",
              "value": "rpm"
@@ -703,22 +671,6 @@
            {
              "text": "writes/min (wpm)",
              "value": "wpm"
-            },
-            {
-              "text": "events/min (epm)",
-              "value": "epm"
-            },
-            {
-              "text": "messages/min (mpm)",
-              "value": "mpm"
-            },
-            {
-              "text": "records/min (rpm)",
-              "value": "recpm"
-            },
-            {
-              "text": "rows/min (rpm)",
-              "value": "rowspm"
            }
          ],
          "text": "throughput"
@@ -1,116 +0,0 @@
-{
-  "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"
-      },
-      "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": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 1,
-      "options": {
-        "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true
-      },
-      "pluginVersion": "10.1.0-pre",
-      "targets": [
-        {
-          "csvContent": "time,x\n2023-06-12T05:49:00Z,10\n2023-06-12T07:01:00Z,20\n2023-06-12T08:13:00Z,NaN\n2023-06-12T09:25:00Z,NaN\n2023-06-12T10:37:00Z,NaN\n2023-06-12T11:49:00Z,30\n2023-06-12T13:01:00Z,20\n2023-06-12T14:13:00Z,10\n2023-06-12T15:25:00Z,Inf\n2023-06-12T16:37:00Z,null\n2023-06-12T17:49:00Z,",
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "csv_content"
-        }
-      ],
-      "title": "SparkLineCell with NaNs,Nulls,Infinity",
-      "transformations": [
-        {
-          "id": "timeSeriesTable",
-          "options": {}
-        }
-      ],
-      "type": "table"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 38,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "2023-06-12T00:00:00.000Z",
-    "to": "2023-06-12T18:00:00.000Z"
-  },
-  "timepicker": {},
-  "timezone": "utc",
-  "title": "Table with SparklineCell",
-  "uid": "d6373b49-1957-4f00-9218-ee2120d3ecd9",
-  "version": 4,
-  "weekStart": ""
-}
@@ -44,9 +44,8 @@ active_sync_enabled = true

 Grafana expects SLO support to be communicated in the metadata

-Single Logout is now supported by authentik in versions `2023.1` and higher;
-
-Source: <https://goauthentik.io/docs/releases/2023.1#new-features>
+Single Logout is not supported by authentik.
+https://github.com/goauthentik/authentik/issues/3321 

 **Warning** Client signature validation

@@ -66,7 +65,7 @@ assertion_attribute_email = http://schemas.xmlsoap.org/ws/2005/05/identity/claim
 assertion_attribute_groups = http://schemas.xmlsoap.org/claims/Group
 assertion_attribute_org = http://schemas.xmlsoap.org/claims/Group
 allow_sign_up = true
-single_logout = true # supported by authentik v2023.1 and newer
+single_logout = false # not supported by authentik
 signature_algorithm = rsa-sha256
 allow_idp_initiated = true
 org_mapping = admin:1:Admin, editor:1:Editor, viewer:1:Viewer
@@ -116,4 +115,4 @@ In case you want to make changes to the devenv setup, you can dump keycloak's DB
 ```bash
 cd devenv;
 docker-compose exec -T authentikdb bash -c "pg_dump -U authentik authentik" > docker/blocks/auth/authentik/cloak.sql
-```
+```
@@ -39,7 +39,7 @@
      - "authentik:authentik"

  authentik:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.5.1}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.2.3}
    restart: unless-stopped
    container_name: authentik
    command: server
@@ -66,7 +66,7 @@
      - "authentikredis:authentikredis"

  authentik-worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.5.1}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.12.1}
    restart: unless-stopped
    container_name: authentik-worker
    command: worker
@@ -153,8 +153,6 @@ function getRandomLogItem(counter, timestamp) {
  };
 }

-let globalCounter = 0;
-
 async function main() {
  await elasticSetupIndexTemplate();
  const SLEEP_ANGLE_STEP = Math.PI / 200;
@@ -164,10 +162,10 @@ async function main() {
    return Math.trunc(1000 * Math.abs(Math.sin(sleepAngle)));
  }

-  while (true) {
+  for (let step = 0; step < 300; step++) {
    await sleep(getNextSineWaveSleepDuration());
    const timestamp = new Date();
-    const item = getRandomLogItem(globalCounter++, timestamp);
+    const item = getRandomLogItem(step + 1, timestamp);
    elasticSendLogItem(timestamp, item);
  }
 }
@@ -2,4 +2,3 @@ FROM prom/prometheus:latest
 ADD prometheus.yml /etc/prometheus/
 ADD recording.yml /etc/prometheus/
 ADD alert.yml /etc/prometheus/
-ADD web.yml /etc/prometheus/
@@ -10,7 +10,6 @@
      --storage.tsdb.path=/prometheus
      --web.console.libraries=/usr/share/prometheus/console_libraries
      --web.console.templates=/usr/share/prometheus/consoles
-      --web.config.file=/etc/prometheus/web.yml

  node_exporter:
    image: prom/node-exporter
@@ -1,3 +0,0 @@
-basic_auth_users:
-  # username: admin, password: admin
-  admin: $2a$12$HvzPxejEHakuEIjxQ8uQrOaZ57GmFznB6M/w.85MpdEtSFFOOyDgW
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -129,7 +129,7 @@ func main() {

 	http.HandleFunc("/listen", func(w http.ResponseWriter, r *http.Request) {
 		log.Printf("got submission from: %s\n", r.RemoteAddr)
-		b, err := io.ReadAll(r.Body)
+		b, err := ioutil.ReadAll(r.Body)
 		if err != nil {
 			log.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
@@ -513,13 +513,6 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
-    dashboard.new('panel_tests_flame_graph', import '../dev-dashboards/panel-flamegraph/panel_tests_flame_graph.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
    dashboard.new('panels_without_title', import '../dev-dashboards/panel-common/panels_without_title.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -583,13 +576,6 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
-    dashboard.new('table_sparkline_cell', import '../dev-dashboards/panel-table/table_sparkline_cell.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
    dashboard.new('table_tests', import '../dev-dashboards/panel-table/table_tests.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -1,5 +1,5 @@
 # The source of this file is https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk.
-# 4.0.0 (2023-06-06)
+# 2.0.0 (2023-05-18)
 include variables.mk
 -include variables.mk.local

@@ -105,6 +105,11 @@ doc-validator: ## Run doc-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/%: make-docs
+	DOCS_IMAGE=$(DOC_VALIDATOR_IMAGE) DOC_VALIDATOR_INCLUDE=$(subst doc-validator/,,$@) $(PWD)/make-docs $(PROJECTS)
+
 .PHONY: vale
 vale: ## Run vale on the entire docs folder.
 vale: make-docs
@@ -1,6 +1,6 @@
 #!/bin/sh
 # The source of this file is https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs.
-# 4.1.0 (2023-06-16)
+# 2.0.0 (2023-05-18)

 set -ef

@@ -13,7 +13,7 @@ readonly DOC_VALIDATOR_SKIP_CHECKS="${DOC_VALIDATOR_SKIP_CHECKS:-^image-}"

 readonly HUGO_REFLINKSERRORLEVEL="${HUGO_REFLINKSERRORLEVEL:-WARNING}"
 readonly VALE_MINALERTLEVEL="${VALE_MINALERTLEVEL:-error}"
-readonly WEBSITE_EXEC="${WEBSITE_EXEC:-make server-docs}"
+readonly WEBSITE_EXEC="${WEBSITE_EXEC:-make docs}"
 # If set, the docs-base image will run a prebuild script that sets up Hugo mounts.
 readonly WEBSITE_MOUNTS="${WEBSITE_MOUNTS:-}"

@@ -63,23 +63,20 @@ SOURCES_as_code='as-code-docs'
 SOURCES_enterprise_metrics='backend-enterprise'
 SOURCES_enterprise_metrics_='backend-enterprise'
 SOURCES_grafana_cloud='website'
-SOURCES_grafana_cloud_alerting_and_irm_machine_learning='machine-learning'
-SOURCES_grafana_cloud_alerting_and_irm_slo='slo'
 SOURCES_grafana_cloud_k6='k6-docs'
 SOURCES_grafana_cloud_data_configuration_integrations='cloud-onboarding'
 SOURCES_grafana_cloud_frontend_observability_faro_web_sdk='faro-web-sdk'
+SOURCES_grafana_cloud_machine_learning='machine-learning'
 SOURCES_helm_charts_mimir_distributed='mimir'
 SOURCES_helm_charts_tempo_distributed='tempo'
 SOURCES_opentelemetry='opentelemetry-docs'
-SOURCES_plugins_grafana_splunk_datasource='splunk-datasource'

 VERSIONS_as_code='UNVERSIONED'
 VERSIONS_grafana_cloud='UNVERSIONED'
-VERSIONS_grafana_cloud_alerting_and_irm_machine_learning='UNVERSIONED'
-VERSIONS_grafana_cloud_alerting_and_irm_slo='UNVERSIONED'
 VERSIONS_grafana_cloud_k6='UNVERSIONED'
 VERSIONS_grafana_cloud_data_configuration_integrations='UNVERSIONED'
 VERSIONS_grafana_cloud_frontend_observability_faro_web_sdk='UNVERSIONED'
+VERSIONS_grafana_cloud_machine_learning='UNVERSIONED'
 VERSIONS_opentelemetry='UNVERSIONED'
 VERSIONS_technical_documentation='UNVERSIONED'
 VERSIONS_website='UNVERSIONED'
@@ -203,14 +200,18 @@ POSIX_HERESTRING
  unset _project _version
 }

-# repo_path returns the host path to the project repository.
+# 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.
-repo_path() {
-  _repo="$1"
+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}"
+      echo "${lookup}/${_repo}/${_path}"
      unset _path _repo
      return
    fi
@@ -220,22 +221,8 @@ repo_path() {
  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 _repo
-  exit 1
-}
-
-# 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
-
-  _repo="$(repo_path "${_repo}")"
-  echo "${_repo}/${_path}"
-
  unset _path _repo
+  exit 1
 }

 # proj_canonical returns the canonical absolute path partial URI for a project.
@@ -310,19 +297,6 @@ url_src_dst_vers="$(url_src_dst_vers "$@")"
 volumes=""
 redirects=""

-for arg in "$@"; do
-  IFS=: read -r _project _ _repo _ <<POSIX_HERESTRING
-${arg}
-POSIX_HERESTRING
-  if [ "${_project}" = website ]; then
-    _repo="$(repo_path website)"
-    volumes="--volume=${_repo}/config:/hugo/config"
-    volumes="${volumes} --volume=${_repo}/layouts/partials:/hugo/layouts/partials"
-    volumes="${volumes} --volume=${_repo}/layouts/shortcodes:/hugo/layouts/shortcodes"
-  fi
-  unset _project _repo
-done
-
 for x in ${url_src_dst_vers}; do
  IFS='^' read -r _url _src _dst _ver <<POSIX_HERESTRING
 $x
@@ -370,8 +344,8 @@ case "${image}" in
      --tty \
      ${volumes} \
      "${DOCS_IMAGE}" \
-      "--include=${DOC_VALIDATOR_INCLUDE}" \
-      "--skip-checks=${DOC_VALIDATOR_SKIP_CHECKS}" \
+      --include="${DOC_VALIDATOR_INCLUDE}" \
+      --skip-checks="${DOC_VALIDATOR_SKIP_CHECKS}" \
      /hugo/content/docs \
      "$(proj_canonical "${proj}")" | sed "s#$(proj_dst "${proj}")#sources#"
    ;;
@@ -387,7 +361,7 @@ case "${image}" in
      --tty \
      ${volumes} \
      "${DOCS_IMAGE}" \
-      "--minAlertLevel=${VALE_MINALERTLEVEL}" \
+      --minAlertLevel="${VALE_MINALERTLEVEL}" \
      --config=/etc/vale/.vale.ini \
      --output=line \
      /hugo/content/docs | sed "s#$(proj_dst "${proj}")#sources#"
@@ -398,7 +372,7 @@ case "${image}" in
 #!/usr/bin/env bash
 for redirect in ${redirects}; do
  IFS='^' read -r path ver <<<"\${redirect}"
-  echo -e "---\\nredirectURL: \"\${path/\/hugo\/content/}\"\\ntype: redirect\\nversioned: true\\n---\\n" > "\${path/\${ver}/_index.md}"
+  echo -e "---\\nredirectURL: \"\${path/\/hugo\/content/}\"\\ntype: redirect\\n---\\n" > "\${path/\${ver}/_index.md}"
 done

 for x in "${url_src_dst_vers}"; do
@@ -263,6 +263,7 @@ title: Grafana documentation
        <h4>Provisioning</h4>
        <p>Learn how to automate your Grafana configuration.</p>
    </a>
+
    <a href="{{< relref "whatsnew/whats-new-in-v10-0/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>What's new in v10</h4>
        <p>Explore the features and enhancements in the latest release.</p>
@@ -32,7 +32,7 @@ Only users with the organization admin role can add data sources.
 1. Click the data source you want to add.
 1. Configure the data source following instructions specific to that data source.

-For links to data source-specific documentation, see [Data sources]({{< relref "../../datasources" >}}).
+   For links to data source-specific documentation, see [Data sources]({{< relref "../../datasources" >}}).

 ## Data source permissions

@@ -81,33 +81,29 @@ You can assign data source permissions to users, teams, and roles which will all

 <div class="clearfix"></div>

-## Query and resource caching
+## Query caching

-When you enable query and resource caching, Grafana temporarily stores the results of data source queries and resource requests. When you or another user submit the same query or resource request again, the results will come back from the cache instead of from the data source.
+When query caching is enabled, Grafana temporarily stores the results of data source queries. When you or another user submit the exact same query again, the results will come back from the cache instead of from the data source (like Splunk or ServiceNow) itself.

-When using Grafana, a query pertains to a request for data frames to be modified or displayed. A resource relates to any HTTP requests made by a plugin, such as the Amazon Timestream plugin requesting a list of available databases from AWS. For more information on data source queries and resources, please see the developers page on [backend plugins]({{< relref "../../developers/plugins/introduction-to-plugin-development/backend/" >}}).
-
-The caching feature works for **all** backend data sources. You can enable the cache globally in Grafana's [configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}), and configure a cache duration (also called Time to Live, or TTL) for each data source individually.
+Query caching works for all backend data sources. You can enable the cache globally and configure the cache duration (also called Time to Live, or TTL).

 {{% admonition type="note" %}}
 Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 {{% /admonition %}}

-The following cache backend options are available: in-memory, Redis, and Memcached.
+The following cache backends are available: in-memory, Redis, and Memcached.

 {{% admonition type="note" %}}
 Storing cached queries in-memory can increase Grafana's memory footprint. In production environments, a Redis or Memcached backend is highly recommended.
 {{% /admonition %}}

-When a panel queries a data source with cached data, it will either fetch fresh data or use cached data depending on the panel's **interval.** The interval is used to round the query time range to a nearby cached time range, increasing the likelihood of cache hits. Therefore, wider panels and dashboards with shorter time ranges fetch new data more often than narrower panels and dashboards with longer time ranges.
+When a panel queries a cached data source, the time until this query fetches fresh data is determined by the panel's **interval.** This means that wider panels and dashboards with shorter time ranges fetch new data more frequently than narrower panels and dashboards with longer time ranges.

-A panel's interval is visible in the [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated as follows: `time range / max data points`. Max data points are calculated based on the width of the panel. For example, a wide panel with `1000 data points` on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes: `7d / 1000 = 10m`. In this example, cached data for this panel will be served for up to 10 minutes before Grafana needs to query the data source again for new data.
+Interval is visible in a panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated like this: `(max data points) / time range`. Max data points are calculated based on the width of the panel. For example, a full-width panel on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes. In this example, cached data for this panel will be served for up to 10 minutes before Grafana queries the data source again and returns new data.

-You can configure a panel to retrieve data more often by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).
+You can make a panel retrieve fresh data more frequently by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).

-### Caching benefits
-
-By reducing the number of queries and requests sent to data sources, caching can provide the following benefits:
+### Query caching benefits

 - Faster dashboard load times, especially for popular dashboards.
 - Reduced API costs.
@@ -115,13 +111,21 @@ By reducing the number of queries and requests sent to data sources, caching can

 ### Data sources that work with query caching

-Query caching works for Grafana's [built-in data sources]({{< relref "../../datasources/#built-in-core-data-sources" >}}), and [backend data source plugins](https://grafana.com/grafana/plugins/?type=datasource) that extend the `DataSourceWithBackend` class in the plugins SDK.
+Query caching works for all [Enterprise data sources](/grafana/plugins/?type=datasource&enterprise=1) as well as the following [built-in data sources]({{< relref "../../datasources/" >}}):

-To verify that a data source works with query caching, follow the [instructions below](#enable-and-configure-query-caching) to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
+- CloudWatch Metrics
+- Google Cloud Monitoring
+- InfluxDB
+- Microsoft SQL Server
+- MySQL
+- Postgres
+- Tempo

-{{% admonition type="note" %}}
-Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana _query_ caching does not significantly improve performance. However, _resource_ caching may help. See the developers page on [plugin resources]({{< relref "../../developers/plugins/introduction-to-plugin-development/backend/#resources" >}}) for details.
-{{% /admonition %}}
+Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana query caching does not improve performance.
+
+Query caching also works for all data sources that include a backend. More specifically, caching works with data sources that extend the `DataSourceWithBackend` class in the plugins SDK.
+
+To tell if a data source works with query caching, follow the instructions below to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.

 ### Enable and configure query caching

@@ -136,7 +140,7 @@ By default, data source queries are not cached. To enable query caching for a si
 1. Click **Enable**.
 1. (Optional) Choose custom TTLs for the data source's queries and resources caching. If you skip this step, then Grafana uses the default TTL.

-You can optionally override a data source's configured TTL for individual dashboard panels. This can be useful when you have queries whose results change more or less often than the configured TTL. In the Edit Panel view, select the caching-enabled data source, expand the Query options, and enter your the TTL in milliseconds.
+You can optionally override a data source's configured TTL for individual dashboard panels. This can be be useful when you have queries whose results change more or less often than the configured TTL. In the Edit Panel view, select the caching-enabled data source, expand the Query options, and enter your the TTL in milliseconds.

 {{< figure max-width="500px" src="/media/docs/grafana/per-panel-cache-ttl-9-4.png" caption="Set Cache TTL for a single panel" >}}

@@ -144,7 +148,7 @@ You can optionally override a data source's configured TTL for individual dashbo
 If query caching is enabled and the Cache tab is not visible in a data source's settings, then query caching is not available for that data source.
 {{% /admonition %}}

-To configure global settings for query caching, refer to the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).
+To configure global settings for query caching, refer to the [Query caching section of Enterprise Configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).

 ### Disable query caching

@@ -155,7 +159,7 @@ To disable query caching for a single data source:
 1. In the data source list, click the data source that you want to turn off caching for.
 1. On the Cache tab, click **Disable**.

-To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.
+To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the [Query caching section of Enterprise Configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.

 ### Clear cache

@@ -19,7 +19,7 @@ Grafana supports three types of plugins: [panels](/grafana/plugins?type=panel),

 ## Panel plugins

-Add new visualizations to your dashboard with panel plugins, such as the [Clock](/grafana/plugins/grafana-clock-panel), [Mosaic](/grafana/plugins/boazreicher-mosaicplot-panel) and [Variable](/grafana/plugins/volkovlabs-variable-panel) panels.
+Add new visualizations to your dashboard with panel plugins, such as the [Worldmap Panel](/grafana/plugins/grafana-worldmap-panel), [Clock](/grafana/plugins/grafana-clock-panel), and [Pie Chart](/grafana/plugins/grafana-piechart-panel).

 Use panel plugins when you want to:

@@ -167,7 +167,7 @@ Grafana also writes an error message to the server log:
 WARN[05-26|12:00:00] Some plugin scanning errors were found   errors="plugin '<plugin id>' is unsigned, plugin '<plugin id>' has an invalid signature"
 ```

-If you are a plugin developer and want to know how to sign your plugin, refer to [Sign a plugin]({{< relref "../../developers/plugins/publish-a-plugin/sign-a-plugin.md" >}}).
+If you are a plugin developer and want to know how to sign your plugin, refer to [Sign a plugin]({{< relref "../../developers/plugins/sign-a-plugin/" >}}).

 | Signature status   | Description                                                                     |
 | ------------------ | ------------------------------------------------------------------------------- |
@@ -222,7 +222,6 @@ Data sources tagged with _HTTP\*_ communicate using the HTTP protocol, which inc
 | cacheLevel                    | string  | Prometheus                                                       | 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).                                                                                                                                         |
-| disableRecordingRules         | boolean | Prometheus                                                       | Experimental: Turn off Prometheus recording rules                                                                                                                                                                                                                                             |
 | 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                                                                                                                                                                                                                            |

@@ -14,7 +14,7 @@ weight: 120
 # Role-based access control (RBAC)

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 RBAC provides a standardized way of granting, changing, and revoking access when it comes to viewing and modifying Grafana resources, such as dashboards, reports, and administrative settings.
@@ -12,7 +12,7 @@ weight: 40
 # Assign RBAC roles

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 In this topic you'll learn how to use the role picker, provisioning, and the HTTP API to assign fixed and custom roles to users and teams.
@@ -10,7 +10,7 @@ weight: 30
 # Configure RBAC in Grafana

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 The table below describes all RBAC configuration options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../../../../setup-grafana/configure-grafana/#configure-with-environment-variables" >}}).
@@ -11,7 +11,7 @@ weight: 80
 # RBAC permissions, actions, and scopes

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 A permission is comprised of an action and a scope. When creating a custom role, consider the actions the user can perform and the resource(s) on which they can perform those actions.
@@ -13,7 +13,7 @@ weight: 50
 # Manage RBAC roles

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 This section includes instructions for how to view permissions associated with roles, create custom roles, and update and delete roles.
@@ -12,7 +12,7 @@ weight: 20
 # Plan your RBAC rollout strategy

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 An RBAC rollout strategy helps you determine _how_ you want to implement RBAC prior to assigning RBAC roles to users and teams.
@@ -12,7 +12,7 @@ weight: 70
 # RBAC role definitions

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 The following tables list permissions associated with basic and fixed roles.
@@ -97,7 +97,7 @@ The following tables list permissions associated with basic and fixed roles.

 ### Alerting roles

-If alerting is [enabled]({{< relref "../../../../alerting/set-up/migrating-alerts/opt-out/" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
+If alerting is [enabled]({{< relref "../../../../alerting/migrating-alerts/opt-out/" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.

 Access to Grafana alert rules is an intersection of many permissions:

@@ -12,7 +12,7 @@ weight: 60
 # Provisioning RBAC with Grafana

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 You can create, change or remove [Custom roles]({{< relref "./manage-rbac-roles/#create-custom-roles-using-provisioning" >}}) and create or remove [basic role assignments]({{< relref "./assign-rbac-roles/#assign-a-fixed-role-to-a-basic-role-using-provisioning" >}}), by adding one or more YAML configuration files in the `provisioning/access-control/` directory.
@@ -11,7 +11,7 @@ weight: 60
 # Provisioning RBAC with Terraform

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 You can create, change or remove [Custom roles](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/role) and create or remove [basic and custom role assignments](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/role_assignment), by using [Terraform's Grafana provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
@@ -28,7 +28,7 @@ filters = accesscontrol:debug accesscontrol.evaluator:debug dashboard.permission
 ## Enable audit logging

 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud Advanced](/docs/grafana-cloud).
 {{% /admonition %}}

 You can enable auditing in the Grafana configuration file.
@@ -89,7 +89,6 @@ If you have [server administrator]({{< relref "../../roles-and-permissions/#graf
   > **Note**: It might be that you are currently in the proper organization and don't need to switch organizations.

 1. Navigate to **Administration > Users**.
-1. Click **Organization users**.
 1. Click **Invite**.
 1. Enter the following information:

@@ -21,7 +21,7 @@ Grafana Alerting is available for Grafana OSS, Grafana Enterprise, or Grafana Cl

 Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}

-_Refer to [Manage your alert rules][alerting-rules] for current instructions._
+_Refer to [Manage your alert rules]({{< relref "../alerting/alerting-rules" >}}) for current instructions._

 ## Key features and benefits

@@ -82,12 +82,4 @@ Here are some tips on how to create an effective alert management set up for you

 ## Useful links

- [Introduction to Alerting][fundamentals]
-
-{{% docs/reference %}}
-[alerting-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules"
-[alerting-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules"
-
-[fundamentals]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals"
-[fundamentals]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals"
-{{% /docs/reference %}}
+- [Introduction to Alerting]({{< relref "./fundamentals" >}})
@@ -1,19 +1,14 @@
 ---
-menuTitle: Configure
 aliases:
  - old-alerting/create-alerts/
  - rules/
  - unified-alerting/alerting-rules/
-description: Configure alerting
-title: Configure Alerting
+description: How you can manage your alert rules
+title: Manage your alert rules
 weight: 130
 ---

-# Configure Alerting
-
-Configure the features and integrations that you need to create and manage your alerts.
-
-**Configure alert rules**
+# Manage your alert rules

 An alert rule is a set of evaluation criteria that determines whether an alert will fire. The 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.

@@ -21,40 +16,12 @@ While queries and expressions select the data set to evaluate, a condition sets

 You can:

- [Create Grafana Mimir or Loki managed alert rules][create-mimir-loki-managed-rule].
- [Create Grafana Mimir or Loki managed recording rules][create-mimir-loki-managed-recording-rule].
- [Edit Grafana Mimir or Loki rule groups and namespaces][edit-mimir-loki-namespace-group].
- [Create Grafana managed alert rules][create-grafana-managed-rule].
+- [Create Grafana Mimir or Loki managed alert rules]({{< relref "./create-mimir-loki-managed-rule" >}})
+- [Create Grafana Mimir or Loki managed recording rules]({{< relref "./create-mimir-loki-managed-recording-rule" >}})
+- [Edit Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group" >}})
+- [Create Grafana managed alert rules]({{< relref "./create-grafana-managed-rule" >}})

 **Note:**
 Grafana managed alert rules can only be edited or deleted by users with Edit permissions for the folder storing the rules.

 Alert rules for an external Grafana Mimir or Loki instance can be edited or deleted by users with Editor or Admin roles.
-
-**Configure contact points**
-
-For information on how to configure contact points, see [Configure contact points][manage-contact-points].
-
-**Configure notification policies**
-
-For information on how to configure notification policies, see [Configure notification policies][create-notification-policy].
-
-{{% docs/reference %}}
-[create-mimir-loki-managed-rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-mimir-loki-managed-rule"
-[create-mimir-loki-managed-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-mimir-loki-managed-rule"
-
-[create-mimir-loki-managed-recording-rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-mimir-loki-managed-recording-rule"
-[create-mimir-loki-managed-recording-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-mimir-loki-managed-recording-rule"
-
-[edit-mimir-loki-namespace-group]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/edit-mimir-loki-namespace-group"
-[edit-mimir-loki-namespace-group]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/edit-mimir-loki-namespace-group"
-
-[create-grafana-managed-rule]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-grafana-managed-rule"
-[create-grafana-managed-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-grafana-managed-rule"
-
-[manage-contact-points]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/manage-contact-points"
-[manage-contact-points]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/manage-contact-points"
-
-[create-notification-policy]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/create-notification-policy"
-[create-notification-policy]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-notification-policy"
-{{% /docs/reference %}}
@@ -18,7 +18,7 @@ Grafana-managed rules are the most flexible alert rule type. They allow you to c

 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][fundamentals], which explains the key concepts and features of Grafana Alerting.
+For information on Grafana Alerting, see [Introduction to Grafana Alerting]({{< relref "../fundamentals" >}}), which explains the key concepts and features of Grafana Alerting.

 Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}

@@ -32,14 +32,14 @@ To create a Grafana-managed alert rule, complete the following steps.
 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][time-units-and-relative-ranges].
+   - Specify a [time range]({{< relref "../../dashboards/use-dashboards#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][add-a-query] or [expressions][expression-queries].
+   - Add one or more [queries]({{< relref "../../panels-visualizations/query-transform-data#add-a-query" >}}) or [expressions]({{< relref "../../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.
@@ -60,7 +60,7 @@ To create a Grafana-managed alert rule, complete the following steps.
 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][annotation-label].
+   - 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.
 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 .
@@ -75,13 +75,13 @@ 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.

-For more information, see [expressions documentation][expression-queries].
+For more information, see [expressions documentation]({{< relref "../../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:

- Add a `Reduce` expression for each query to aggregate values in the selected time range into a single value. (Not needed for [rules using numeric data][alerting-on-numeric-data].
+- Add a `Reduce` expression for each query to aggregate values in the selected time range into a single value. (Not needed for [rules using numeric data]({{< relref "../fundamentals/evaluate-grafana-alerts#alerting-on-numeric-data-1" >}})).
 - Add a `Math` expression with the condition for the rule. Not needed in case a query or a reduce expression already returns 0 if rule should not fire, or a positive number if it should fire. Some examples: `$B > 70` if it should fire in case value of B query/expression is more than 70. `$B < $C * 100` in case it should fire if value of B is less than value of C multiplied by 100. If queries being compared have multiple series in their results, series from different queries are matched if they have the same labels or one is a subset of the other.

 ![Query section multi dimensional](/static/img/docs/alerting/unified/rule-edit-multi-8-0.png 'Query section multi dimensional screenshot')
@@ -115,23 +115,3 @@ If your evaluation returns an error, you can set the state on your alert rule to
 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**.
-
-{{% docs/reference %}}
-[add-a-query]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data#add-a-query"
-[add-a-query]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data#add-a-query"
-
-[alerting-on-numeric-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/evaluate-grafana-alerts#alerting-on-numeric-data-1")
-[alerting-on-numeric-data]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/evaluate-grafana-alerts#alerting-on-numeric-data-1")
-
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
-
-[expression-queries]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/expression-queries"
-[expression-queries]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data/expression-queries"
-
-[fundamentals]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals"
-[fundamentals]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals"
-
-[time-units-and-relative-ranges]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards#time-units-and-relative-ranges"
-[time-units-and-relative-ranges]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/dashboards/use-dashboards#time-units-and-relative-ranges"
-{{% /docs/reference %}}
@@ -22,7 +22,7 @@ You can create and manage recording rules for an external Grafana Mimir or Loki

 Recording rules are run as instant rules, which means that they run every 10s. To overwrite this configuration, update the min_interval in your custom configuration file.

-[min_interval][configure-grafana] sets the minimum interval to enforce between rule evaluations. The default value is 10s which equals the scheduler interval. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as fewer evaluations are scheduled over time.
+[min_interval]({{< relref "../../setup-grafana/configure-grafana" >}}) sets the minimum interval to enforce between rule evaluations. The default value is 10s which equals the scheduler interval. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as fewer evaluations are scheduled over time.

 This setting has precedence over each individual rule frequency. If a rule frequency is lower than this value, then this value is enforced.

@@ -55,21 +55,10 @@ To create a Grafana Mimir or Loki managed recording rule
 1. In Step 3, add alert evaluation behavior.
   - Enter a valid **For** duration. The expression has to be true for this long for the alert to be fired.
 1. In Step 4, add additional metadata associated with the rule.
-   - From the **Namespace** dropdown, select an existing rule namespace or add a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces][edit-mimir-loki-namespace-group].
-   - From the **Group** dropdown, select an existing group within the selected namespace or add a new one. 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][annotation-label].
+   - From the **Namespace** dropdown, select an existing rule namespace. Otherwise, click Add new and enter a name to create a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group" >}}).
+   - From the **Group** dropdown, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create a new one. 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.
   - 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.
-
-{{% docs/reference %}}
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
-
-[configure-grafana]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana"
-[configure-grafana]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana"
-
-[edit-mimir-loki-namespace-group]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/edit-mimir-loki-namespace-group"
-[edit-mimir-loki-namespace-group]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/edit-mimir-loki-namespace-group"
-{{% /docs/reference %}}
@@ -10,13 +10,13 @@ keywords:
  - guide
  - rules
  - create
-title: Create Grafana Mimir or Loki managed alert rules
+title: Create a Grafana Mimir or Loki managed alerting rules
 weight: 400
 ---

-# Create Grafana Mimir or Loki managed alert rules
+# Create a Grafana Mimir or Loki managed alerting rules

-Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance that has ruler API enabled. For information on Grafana Alerting, see [About Grafana Alerting][alerting] which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts][fundamentals] of Grafana Alerting.
+Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance that has ruler API enabled. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../../alerting" >}}) 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.

 ## Before you begin

@@ -50,25 +50,11 @@ If you do not want to manage alerting rules for a particular Loki or Prometheus
   - In the **For** text box, specify the duration for which the condition must be true before an alert fires. If you specify `5m`, the condition must be true for 5 minutes before the alert fires.
     > **Note:** Once a condition is met, the alert goes into the `Pending` state. If the condition remains active for the duration specified, the alert transitions to the `Firing` state, else it reverts to the `Normal` state.
 1. In Step 4, add the namespace, rule group, as well as additional metadata associated with the rule.
-   - From the **Namespace** dropdown, select an existing rule namespace. Otherwise, click **Add new** and enter a name to create a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces][edit-mimir-loki-namespace-group].
+   - From the **Namespace** dropdown, select an existing rule namespace. Otherwise, click **Add new** and enter a name to create a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group" >}}).
   - From the **Group** dropdown, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create a new one. 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][annotation-label].
+   - 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.
   - 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 notification for the rule.
-
-{{% docs/reference %}}
-[alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting"
-[alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting"
-
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
-
-[edit-mimir-loki-namespace-group]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules/edit-mimir-loki-namespace-group"
-[edit-mimir-loki-namespace-group]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/edit-mimir-loki-namespace-group"
-
-[fundamentals]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals"
-[fundamentals]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals"
-{{% /docs/reference %}}
@@ -1,13 +1,11 @@
 ---
-aliases:
-  - alerting/alerting-rules/declare-incident-from-alert/
 description: Declare an incident from a firing alert
 keywords:
  - grafana
  - alert rules
  - incident
 title: Declare incidents from firing alerts
-weight: 1010
+weight: 430
 ---

 # Declare incidents from firing alerts
@@ -79,13 +79,34 @@ Use the State history view to get insight into how your alert instances behave o

 ### Configure the state history view

-To enable the state history view, see [Configuring alert state history]({{< relref "../set-up/configure-alert-state-history/index.md" >}}).
+**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. Navigate to **Alerts&IRM** -> **Alerting** -> **Alert rules**.
 1. Click an alert rule.
 1. Select **Show state history**.

@@ -1,5 +1,4 @@
 ---
-menuTitle: Introduction
 aliases:
  - metrics/
  - unified-alerting/fundamentals/
@@ -46,7 +45,7 @@ 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.

-For more information on notification policies, see [fundamentals of Notification Policies][notification-policies].
+For more information on notification policies, see [fundamentals of Notification Policies]({{< relref "../fundamentals/notification-policies/index.md" >}}).

 **Message templates**

@@ -57,8 +56,3 @@ Use message templates for your notifications to create reusable custom templates
 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.
-
-{{% docs/reference %}}
-[notification-policies]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/notification-policies"
-[notification-policies]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notification-policies"
-{{% /docs/reference %}}
@@ -5,7 +5,7 @@ keywords:
  - alerting
  - rules
 title: Alert rules
-weight: 105
+weight: 101
 ---

 # Alert rules
@@ -16,21 +16,7 @@ While queries and expressions select the data set to evaluate, a condition sets

 An interval specifies how frequently an alerting rule is evaluated. Duration, when configured, indicates how long a condition must be met. The alert rules can also define alerting behavior in the absence of data.

- [Alert rule types][alert-rule-types]
- [Alert instances][alert-instances]
- [Organising alert rules][organising-alerts]
- [Annotation and labels][annotation-label]
-
-{{% docs/reference %}}
-[alert-instances]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alert-rules/alert-instances"
-[alert-instances]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/alert-instances"
-
-[alert-rule-types]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alert-rules/alert-rule-types"
-[alert-rule-types]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/alert-rule-types"
-
-[annotation-label]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label"
-[annotation-label]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label"
-
-[organising-alerts]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/alert-rules/organising-alerts"
-[organising-alerts]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/organising-alerts"
-{{% /docs/reference %}}
+- [Alert rule types]({{< relref "./alert-rule-types" >}})
+- [Alert instances]({{< relref "./alert-instances" >}})
+- [Organising alert rules]({{< relref "./organising-alerts" >}})
+- [Annotation and labels]({{< relref "../annotation-label" >}})
@@ -5,7 +5,7 @@ keywords:
  - alerting
  - instances
 title: Alert instances
-weight: 104
+weight: 103
 ---

 # Alert instances
@@ -5,7 +5,7 @@ keywords:
  - alerting
  - organization
 title: Organising alert rules
-weight: 105
+weight: 104
 ---

 ## Namespaces and groups
@@ -1,110 +0,0 @@
---
-title: Queries and conditions
-description: Introduction to queries and conditions
-weight: 103
-keywords:
-  - grafana
-  - alerting
-  - queries
-  - conditions
---
-
-# Queries and conditions
-
-In Grafana, queries play a vital role in fetching and transforming data from supported data sources, which include databases like MySQL and PostgreSQL, time series databases like Prometheus, InfluxDB and Graphite, and services like Elasticsearch, AWS CloudWatch, Azure Monitor and Google Cloud Monitoring.
-
-For more information on supported data sources, see [Data sources][data-source-alerting].
-
-The process of executing a query involves defining the data source, specifying the desired data to retrieve, and applying relevant filters or transformations. Query languages or syntaxes specific to the chosen data source are utilized for constructing these queries.
-
-In Alerting, you define a query to get the data you want to measure and a condition that needs to be met before an alert rule fires.
-
-An alert rule consists of one or more queries and expressions that select the data you want to measure.
-
-For more information on queries and expressions, see [Query and transform data][query-transform-data].
-
-## Data source queries
-
-Queries in Grafana can be applied in various ways, depending on the data source and query language being used. Each data source’s query editor provides a customized user interface that helps you write queries that take advantage of its unique capabilities.
-
-Because of the differences between query languages, each data source query editor looks and functions differently. Depending on your data source, the query editor might provide auto-completion features, metric names, variable suggestions, or a visual query-building interface.
-
-Some common types of query components include:
-
-**Metrics or data fields**: Specify the specific metrics or data fields you want to retrieve, such as CPU usage, network traffic, or sensor readings.
-
-**Time range**: Define the time range for which you want to fetch data, such as the last hour, a specific day, or a custom time range.
-
-**Filters**: Apply filters to narrow down the data based on specific criteria, such as filtering data by a specific tag, host, or application.
-
-**Aggregations**: Perform aggregations on the data to calculate metrics like averages, sums, or counts over a given time period.
-
-**Grouping**: Group the data by specific dimensions or tags to create aggregated views or breakdowns.
-
-**Note**:
-
-Grafana does not support alert queries with template variables. More information is available [here](https://community.grafana.com/t/template-variables-are-not-supported-in-alert-queries-while-setting-up-alert/2514).
-
-## Expression queries
-
-In Grafana, an expression is used to perform calculations, transformations, or aggregations on the data source queried data. It allows you to create custom metrics or modify existing metrics based on mathematical operations, functions, or logical expressions.
-
-By leveraging expression queries, users can perform tasks such as calculating the percentage change between two values, applying functions like logarithmic or trigonometric functions, aggregating data over specific time ranges or dimensions, and implementing conditional logic to handle different scenarios.
-
-In Alerting, you can only use expressions for Grafana-managed alert rules. For each expression, you can choose from the math, reduce, and resample expressions. These are called multi-dimensional rules, because they generate a separate alert for each series.
-
-You can also use classic condition, which creates an alert rule that triggers a single alert when its condition is met. As a result, Grafana sends only a single alert even when alert conditions are met for multiple series.
-
-**Note:**
-
-Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
-
-**Reduce**
-
-Aggregates time series values in the selected time range into a single value.
-
-**Math**
-
-Performs free-form math functions/operations on time series and number data. Can be used to preprocess time series data or to define an alert condition for number data.
-
-**Resample**
-
-Realigns a time range to a new set of timestamps, this is useful when comparing time series data from different data sources where the timestamps would otherwise not align.
-
-**Threshold**
-
-Checks if any time series data matches the threshold condition.
-
-The threshold expression allows you to compare two single values. It returns `0` when the condition is false and `1` if the condition is true. The following threshold functions are available:
-
- Is above (x > y)
- Is below (x < y)
- Is within range (x > y1 AND x < y2)
- Is outside range (x < y1 AND x > y2)
-
-**Classic condition**
-
-Checks if any time series data matches the alert condition.
-
-**Note**:
-
-Classic condition expression queries always produce one alert instance only, no matter how many time series meet the condition.
-Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
-
-## Alert condition
-
-An alert condition is the query or expression that determines whether the alert will fire or not depending on the value it yields. There can be only one condition which will determine the triggering of the alert.
-
-After you have defined your queries and/or expressions, choose one of them as the alert rule condition.
-
-When the queried data satisfies the defined condition, Grafana triggers the associated alert, which can be configured to send notifications through various channels like email, Slack, or PagerDuty. The notifications inform you about the condition being met, allowing you to take appropriate actions or investigate the underlying issue.
-
-By default, the last expression added is used as the alert condition.
-
-{{% docs/reference %}}
-[data-source-alerting]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/data-source-alerting"
-[data-source-alerting]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/data-source-alerting"
-
-[query-transform-data]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
-[query-transform-data]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/query-transform-data"
-{{% /docs/reference %}}
@@ -1,64 +0,0 @@
---
-title: Alert rule evaluation
-description: Introduction to alert rule evaluation
-weight: 106
-keywords:
-  - grafana
-  - alerting
-  - evaluation
---
-
-# Alert rule evaluation
-
-Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state.
-
-To do this, you need to make sure that your alert rule is in the right evaluation group and set a pending period time that works best for your use case.
-
-## Evaluation group
-
-Every alert rule is part of an evaluation group. Each evaluation group contains an evaluation interval that determines how frequently the alert rule is checked. Alert rules within the same group are evaluated one after the other, while alert rules in different groups can be evaluated simultaneously.
-
-This feature is especially useful for Prometheus/Mimir rules when you want to ensure that recording rules are evaluated before any alert rules.
-
-**Note:**
-
-Evaluation groups and alerts grouping in notification policies are two separate things. Grouping in notification policies allows multiple alerts sharing the same labels to be sent in the same time message.
-
-## Pending period
-
-By setting a pending period, you can avoid unnecessary alerts for temporary problems.
-
-In the pending period, you select the period in which an alert rule can be in breach of the condition until it fires.
-
-**Example**
-
-Imagine you have an alert rule evaluation interval set at every 30 seconds and the pending period to 90 seconds.
-
-Evaluation will occur as follows:
-
-[00:30] First evaluation - condition not met.
-
-[01:00] Second evaluation - condition breached.
-Pending counter starts. **Alert stars pending.**
-
-[01:30] Third evaluation - condition breached. Pending counter = 30s. **Pending state.**
-
-[02:00] Fourth evaluation - condition breached. Pending counter = 60s **Pending state.**
-
-[02:30] Fifth evaluation - condition breached. Pending counter = 90s. **Alert starts firing**
-
-If the alert rule has a condition that needs to be in breach for a certain amount of time before it takes action, then its state changes as follows:
-
- When the condition is first breached, the rule goes into a "pending" state.
-
- The rule stays in the "pending" state until the condition has been broken for the required amount of time - pending period.
-
- Once the required time has passed, the rule goes into a "firing" state.
-
- If the condition is no longer broken during the pending period, the rule goes back to its normal state.
-
-**Note:**
-
-If you want to skip the pending state, you can simply set the pending period to 0. This effectively skips the pending period and your alert rule will start firing as soon as the condition is breached.
-
-When an alert rule fires, alert instances are produced, which are then sent to the Alertmanager.
@@ -10,7 +10,7 @@ keywords:
  - rules
  - create
 title: Labels and annotations
-weight: 110
+weight: 401
 ---

 # Labels and annotations
@@ -19,7 +19,7 @@ Labels and annotations contain information about an alert. Both labels and annot

 The main difference between a label and an annotation is that labels are used to differentiate an alert from all other alerts, while annotations are used to add additional information to an existing alert.

-For example, consider two high CPU alerts: one for `server1` and another for `server2`. In such an example we might have a label called `server` where the first alert has the label `server="server1"` and the second alert has the label `server="server2"`. However, we might also want to add a description to each alert such as `"The CPU usage for server1 is above 75%."`, where `server1` and `75%` are replaced with the name and CPU usage of the server (please refer to the documentation on [templating labels and annotations][variables-label-annotation] for how to do this). This kind of description would be more suitable as an annotation.
+For example, consider two high CPU alerts: one for `server1` and another for `server2`. In such an example we might have a label called `server` where the first alert has the label `server="server1"` and the second alert has the label `server="server2"`. However, we might also want to add a description to each alert such as `"The CPU usage for server1 is above 75%."`, where `server1` and `75%` are replaced with the name and CPU usage of the server (please refer to the documentation on [templating labels and annotations]({{< relref "./variables-label-annotation" >}}) for how to do this). This kind of description would be more suitable as an annotation.

 ## Labels

@@ -31,7 +31,7 @@ The label set for an alert is a combination of the labels from the datasource, c

 ### Custom Labels

-Custom labels are additional labels from the alert rule. Like annotations, custom labels must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired. Documentation on how to template custom labels can be found [here][variables-label-annotation].
+Custom labels are additional labels from the alert rule. Like annotations, custom labels must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired. Documentation on how to template custom labels can be found [here]({{< relref "./variables-label-annotation" >}}).

 When using custom labels with templates it is important to make sure that the label value does not change between consecutive evaluations of the alert rule as this will end up creating large numbers of distinct alerts. However, it is OK for the template to produce different label values for different alerts. For example, do not put the value of the query in a custom label as this will end up creating a new set of alerts each time the value changes. Instead use annotations.

@@ -39,9 +39,4 @@ It is also important to make sure that the label set for an alert does not have

 ## Annotations

-Annotations are named pairs that add additional information to existing alerts. There are a number of suggested annotations in Grafana such as `description`, `summary`, `runbook_url`, `dashboardUId` and `panelId`. Like custom labels, annotations must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired. If an annotation contains template code, the template is evaluated once when the alert is fired. It is not re-evaluated, even when the alert is resolved. Documentation on how to template annotations can be found [here][variables-label-annotation].
-
-{{% docs/reference %}}
-[variables-label-annotation]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/fundamentals/annotation-label/variables-label-annotation"
-[variables-label-annotation]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/annotation-label/variables-label-annotation"
-{{% /docs/reference %}}
+Annotations are named pairs that add additional information to existing alerts. There are a number of suggested annotations in Grafana such as `description`, `summary`, `runbook_url`, `dashboardUId` and `panelId`. Like custom labels, annotations must have a name, and their value can contain a combination of text and template code that is evaluated when an alert is fired. If an annotation contains template code, the template is evaluated once when the alert is fired. It is not re-evaluated, even when the alert is resolved. Documentation on how to template annotations can be found [here]({{< relref "./variables-label-annotation" >}}).
@@ -17,7 +17,7 @@ This topic explains why labels are a fundamental component of alerting.
 - The Alertmanager uses labels to match alerts for silences and alert groups in notification policies.
 - The alerting UI shows labels for every alert instance generated during evaluation of that rule.
 - Contact points can access labels to dynamically generate notifications that contain information specific to the alert that is resulting in a notification.
- You can add labels to an [alerting rule][alerting-rules]. Labels are manually configurable, use template functions, and can reference other labels. Labels added to an alerting rule take precedence in the event of a collision between labels (except in the case of [Grafana reserved labels](#grafana-reserved-labels)).
+- You can add labels to an [alerting rule]({{< relref "../../alerting-rules" >}}). Labels are manually configurable, use template functions, and can reference other labels. Labels added to an alerting rule take precedence in the event of a collision between labels (except in the case of [Grafana reserved labels](#grafana-reserved-labels)).

 {{< figure src="/static/img/docs/alerting/unified/rule-edit-details-8-0.png" max-width="550px" caption="Alert details" >}}

@@ -39,7 +39,7 @@ Example: A label key/value pair `Alert! 🔔="🔥"` will become `Alert_0x1f514=

 {{% admonition type="note" %}}
 Labels prefixed with `grafana_` are reserved by Grafana for special use. If a manually configured label is added beginning with `grafana_` it may be overwritten in case of collision.
-To stop the Grafana Alerting engine from adding a reserved label, you can disable it via the `disabled_labels` option in [unified_alerting.reserved_labels][unified-alerting-reserved-labels] configuration.
+To stop the Grafana Alerting engine from adding a reserved label, you can disable it via the `disabled_labels` option in [unified_alerting.reserved_labels]({{< relref "../../../setup-grafana/configure-grafana#unified_alertingreserved_labels" >}}) configuration.
 {{% /admonition %}}

 Grafana reserved labels can be used in the same way as manually configured labels. The current list of available reserved labels are:
@@ -47,11 +47,3 @@ Grafana reserved labels can be used in the same way as manually configured label
 | Label          | Description                               |
 | -------------- | ----------------------------------------- |
 | grafana_folder | Title of the folder containing the alert. |
-
-{{% docs/reference %}}
-[alerting-rules]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/alerting-rules"
-[alerting-rules]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules"
-
-[unified-alerting-reserved-labels]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#unified_alertingreserved_labels"
-[unified-alerting-reserved-labels]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/configure-grafana#unified_alertingreserved_labels"
-{{% /docs/reference %}}
@@ -164,7 +164,7 @@ https://example.com/grafana

 ### graphLink

-The `graphLink` function returns the path to the graphical view in [Explore][explore] for the given expression and data source.
+The `graphLink` function returns the path to the graphical view in [Explore]({{< relref "../../../explore" >}}) for the given expression and data source.

 #### Example

@@ -276,7 +276,7 @@ The `pathPrefix` function returns the path of the Grafana server as configured i

 ### tableLink

-The `tableLink` function returns the path to the tabular view in [Explore][explore] for the given expression and data source.
+The `tableLink` function returns the path to the tabular view in [Explore]({{< relref "../../../explore" >}}) for the given expression and data source.

 #### Example

@@ -343,8 +343,3 @@ The `reReplaceAll` function replaces text matching the regular expression.
 ```
 example.com:8080
 ```
-
-{{% docs/reference %}}
-[explore]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/explore"
-[explore]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/explore"
-{{% /docs/reference %}}
@@ -12,18 +12,14 @@ keywords:
  - notification channel
  - create
 title: Contact points
-weight: 106
+weight: 410
 ---

 # Contact points

-Contact points contain the configuration for sending notifications. A contact point is a list of integrations, each of which sends a notification to a particular email address, service or URL. Contact points can have multiple integrations of the same kind, or a combination of integrations of different kinds. For example, a contact point could contain a Pagerduty integration; an email and Slack integration; or a Pagerduty integration, a Slack integration, and two email integrations. You can also configure a contact point with no integrations; in which case no notifications are sent.
+Use contact points to define how your contacts are notified when an alert rule fires. A contact point can have one or more contact point types, for example, email, slack, webhook, and so on. When an alert rule fires, a notification is sent to all contact point types listed for a contact point. Contact points can be configured for the Grafana Alertmanager as well as external alertmanagers.

-A contact point cannot send notifications until it has been added to a notification policy. A notification policy can only send alerts to one contact point, but a contact point can be added to a number of notification policies at the same time. When an alert matches a notification policy, the alert is sent to the contact point in that notification policy, which then sends a notification to each integration in its configuration.
-
-Contact points can be configured for the Grafana Alertmanager as well as external alertmanagers.
-
-You can also use notification templating to customize notification messages for contact point integrations.
+You can also use notification templating to customize notification messages for contact point types.

 **Note:**

@@ -55,3 +51,9 @@ The following table lists the contact point integrations supported by Grafana.
 | Cisco Webex Teams                                | `webex`                   | Supported            | Supported                                                                                                |
 | WeCom                                            | `wecom`                   | Supported            | N/A                                                                                                      |
 | [Zenduty](https://www.zenduty.com/)              | `webhook`                 | Supported            | N/A                                                                                                      |
+
+## Useful links
+
+[Manage contact points]({{< relref "../../manage-notifications/manage-contact-points" >}})
+
+[Create and edit notification templates]({{< relref "../../manage-notifications/template-notifications/create-notification-templates" >}})
@@ -10,79 +10,27 @@ There are a number of data sources that are compatible with Grafana Alerting. Ea

 If you are creating your own data source plugin, make sure it is a backend plugin as Grafana Alerting requires this in order to be able to evaluate rules using the data source. Frontend data sources are not supported, because the evaluation engine runs on the backend.

-Specifying `{ "alerting": true, “backend”: true }` in the plugin.json file indicates that the data source plugin is compatible with Grafana Alerting and includes the backend data-fetching code. For more information, refer to [Build a data source backend plugin](/tutorials/build-a-data-source-backend-plugin/).
+Specifying { "alerting": true, “backend”: true } in the plugin.json file indicates that the data source plugin is compatible with Grafana Alerting and includes the backend data-fetching code. For more information, refer to [Build a data source backend plugin](/tutorials/build-a-data-source-backend-plugin/).

 These are the data sources that are compatible with and supported by Grafana Alerting.

- [AWS CloudWatch][aws-cloudwatch]
- [Azure Monitor][azure-monitor]
- [Elasticsearch][elasticsearch]
- [Google Cloud Monitoring][google-cloud-monitoring]
- [Graphite][graphite]
- [InfluxDB][influxdb]
- [Loki][loki]
- [Microsoft SQL Server MSSQL][mssql]
- [MySQL][mysql]
- [Open TSDB][opentsdb]
- [PostgreSQL][postgres]
- [Prometheus][prometheus]
- [Jaeger][jaeger]
- [Zipkin][zipkin]
- [Tempo][tempo]
- [Testdata][testdata]
+- [AWS CloudWatch]({{< relref "../../datasources/aws-cloudwatch" >}})
+- [Azure Monitor]({{< relref "../../datasources/azure-monitor" >}})
+- [Elasticsearch]({{< relref "../../datasources/elasticsearch" >}})
+- [Google Cloud Monitoring]({{< relref "../../datasources/google-cloud-monitoring" >}})
+- [Graphite]({{< relref "../../datasources/graphite" >}})
+- [InfluxDB]({{< relref "../../datasources/influxdb" >}})
+- [Loki]({{< relref "../../datasources/loki" >}})
+- [Microsoft SQL Server MSSQL]({{< relref "../../datasources/mssql" >}})
+- [MySQL]({{< relref "../../datasources/mysql" >}})
+- [Open TSDB]({{< relref "../../datasources/opentsdb" >}})
+- [PostgreSQL]({{< relref "../../datasources/postgres" >}})
+- [Prometheus]({{< relref "../../datasources/prometheus" >}})
+- [Jaeger]({{< relref "../../datasources/jaeger" >}})
+- [Zipkin]({{< relref "../../datasources/zipkin" >}})
+- [Tempo]({{< relref "../../datasources/tempo" >}})
+- [Testdata]({{< relref "../../datasources/testdata" >}})

 ## Useful links

- [Grafana data sources][datasources]
-
-{{% docs/reference %}}
-[datasources]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources"
-
-[aws-cloudwatch]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/aws-cloudwatch"
-[aws-cloudwatch]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/aws-cloudwatch"
-
-[azure-monitor]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/azure-monitor"
-[azure-monitor]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/azure-monitor"
-
-[elasticsearch]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/elasticsearch"
-[elasticsearch]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/elasticsearch"
-
-[google-cloud-monitoring]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/google-cloud-monitoring"
-[google-cloud-monitoring]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/google-cloud-monitoring"
-
-[graphite]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/graphite"
-[graphite]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/graphite"
-
-[influxdb]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/influxdb"
-[influxdb]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/influxdb"
-
-[loki]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/loki"
-[loki]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/loki"
-
-[mssql]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mssql"
-[mssql]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mssql"
-
-[mysql]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mysql"
-[mysql]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/mysql"
-
-[opentsdb]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/opentsdb"
-[opentsdb]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/opentsdb"
-
-[postgres]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/postgres"
-[postgres]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/postgres"
-
-[prometheus]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/prometheus"
-[prometheus]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/prometheus"
-
-[jaeger]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/jaeger"
-[jaeger]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/jaeger"
-
-[zipkin]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/zipkin"
-[zipkin]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/zipkin"
-
-[tempo]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo"
-[tempo]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/tempo"
-
-[testdata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/datasources/testdata"
-[testdata]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/datasources/testdata"
-{{% /docs/reference %}}
+- [Grafana data sources]({{< relref "../../datasources" >}})
@@ -24,11 +24,11 @@ Grafana managed alerts query the following backend data sources that have alerti

 - built-in data sources or those developed and maintained by Grafana: `Graphite`, `Prometheus`, `Loki`, `InfluxDB`, `Elasticsearch`,
  `Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Monitor`
- community developed backend data sources with alerting enabled (`backend` and `alerting` properties are set in the [plugin.json][metadata])
+- community developed backend data sources with alerting enabled (`backend` and `alerting` properties are set in the [plugin.json]({{< relref "../../developers/plugins/metadata" >}}))

 ### Metrics from the alerting engine

-The alerting engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics][set-up-grafana-monitoring].
+The alerting engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../../setup-grafana/set-up-grafana-monitoring" >}}).

 | Metric Name                                       | Type      | Description                                                                              |
 | ------------------------------------------------- | --------- | ---------------------------------------------------------------------------------------- |
@@ -100,11 +100,3 @@ When this query is used as the **condition** in an alert rule, then the non-zero
 | {Host=web1,disk=/etc} | Alerting |
 | {Host=web2,disk=/var} | Alerting |
 | {Host=web3,disk=/var} | Normal   |
-
-{{% docs/reference %}}
-[metadata]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/developers/plugins/metadata"
-[metadata]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/developers/plugins/metadata"
-
-[set-up-grafana-monitoring]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/set-up-grafana-monitoring"
-[set-up-grafana-monitoring]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/setup-grafana/set-up-grafana-monitoring"
-{{% /docs/reference %}}
@@ -32,9 +32,4 @@ The notification logs and silences are persisted in the database periodically an

 ## Useful links

-[Configure alerting high availability][configure-high-availability]
-
-{{% docs/reference %}}
-[configure-high-availability]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/alerting/set-up/configure-high-availability"
-[configure-high-availability]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-high-availability"
-{{% /docs/reference %}}
+[Configure alerting high availability]({{< relref "../../set-up/configure-high-availability" >}})
@@ -1,47 +0,0 @@
---
-title: Notifications
-description: Introduction to notifications Policies
-weight: 107
-keywords:
-  - grafana
-  - alerting
-  - notification policies
---
-
-# Notifications
-
-Choosing how, when, and where to send your alert notifications is an important part of setting up your alerting system. These decisions will have a direct impact on your ability to resolve issues quickly and not miss anything important.
-
-As a first step, define your contact points; where to send your alert notifications to. A contact point is a set of one or more integrations that are used to deliver notifications. Add notification templates to contact points for reuse and consistent messaging in your notifications.
-
-Next, create a notification policy which is a set of rules for where, when and how your alerts are routed to contact points. In a notification policy, you define where to send your alert notifications by choosing one of the contact points you created.
-
-## Alertmanagers
-
-Grafana uses Alertmanagers to send notifications for firing and resolved alerts. Grafana has its own Alertmanager, referred to as "Grafana" in the user interface, but also supports sending notifications from other Alertmanagers too, such as the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/). The Grafana Alertmanager uses notification policies and contact points to configure how and where a notification is sent; how often a notification should be sent; and whether alerts should all be sent in the same notification, sent in grouped notifications based on a set of labels, or as separate notifications.
-
-## Notification policies
-
-Notification policies control when and where notifications are sent. A notification policy can choose to send all alerts together in the same notification, send alerts in grouped notifications based on a set of labels, or send alerts as separate notifications. You can configure each notification policy to control how often notifications should be sent as well as having one or more mute timings to inhibit notifications at certain times of the day and on certain days of the week.
-
-Notification policies are organized in a tree structure where at the root of the tree there is a notification policy called the default policy. There can be only one default policy and the default policy cannot be deleted.
-
-Specific routing policies are children of the default policy and can be used to match either all alerts or a subset of alerts based on a set of matching labels. A notification policy matches an alert when its matching labels match the labels in the alert.
-
-A nested policy can have its own nested policies, which allow for additional matching of alerts. An example of a nested policy could be sending infrastructure alerts to the Ops team; while a nested policy might send high priority alerts to Pagerduty and low priority alerts as emails.
-
-All alerts, irrespective of their labels, match the default policy. However, when the default policy receives an alert it looks at each nested policy and sends the alert to the first nested policy that matches the alert. If the nested policy has further nested policies, then it can attempt to the match the alert against one of its nested policies. If no nested policies match the alert then the policy itself is the matching policy. If there are no nested policies, or no nested policies match the alert, then the default policy is the matching policy.
-
-<!-- This definitely needs a diagram and some examples (Gilles) -->
-
-## Notification templates
-
-You can customize notifications with templates. For example, templates can be used to change the subject and message of an email, or the title and message of notifications sent to Slack.
-
-Templates are not limited to an individual integration or contact point, but instead can be used in a number of integrations in the same contact point and even integrations across different contact points. For example, a Grafana user can create a template called `custom_subject_or_title` and use it for both templating subjects in emails and titles of Slack messages without having to create two separate templates.
-
-All notifications templates are written in [Go's templating language](https://pkg.go.dev/text/template), and are in the Contact points tab on the Alerting page.
-
-## Silences
-
-You can use silences to mute notifications from one or more firing rules. Silences do not stop alerts from firing or being resolved, or hide firing alerts in the user interface. A silence lasts as long as its duration which can be configured in minutes, hours, days, months or years.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kevin Minehart	17397c7753	Merge remote-tracking branch 'origin' into km/test-tag-build	2023-06-12 12:08:12 -05:00
Kevin Minehart	f60ea178c5	also install bash	2023-06-08 11:42:05 -05:00
Kevin Minehart	afa018762f	also install bash	2023-06-08 11:41:07 -05:00
Kevin Minehart	b9deb999a1	Add enterprise2 in list-release-artifacts	2023-06-08 11:32:09 -05:00