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
3455 changed files with 66035 additions and 120122 deletions
@@ -55,16 +55,6 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
      [0, 0, 0, "Do not use any type assertions.", "17"]
    ],
-    "packages/grafana-data/src/dataframe/StreamingDataFrame.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "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"]
-    ],
    "packages/grafana-data/src/dataframe/dimensions.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
@@ -208,9 +198,7 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
    ],
    "packages/grafana-data/src/geo/layer.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
    "packages/grafana-data/src/panel/PanelPlugin.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -238,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"]
@@ -475,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"],
@@ -556,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"],
@@ -567,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"],
@@ -581,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"],
@@ -598,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"]
@@ -794,6 +776,9 @@ exports[`better eslint`] = {
    "packages/grafana-runtime/src/analytics/types.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
+    "packages/grafana-runtime/src/components/DataSourcePicker.tsx:5381": [
+      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
+    ],
    "packages/grafana-runtime/src/components/PanelRenderer.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -882,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"],
@@ -1077,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"],
@@ -1559,7 +1555,7 @@ exports[`better eslint`] = {
    "public/app/core/components/QueryOperationRow/QueryOperationAction.tsx:5381": [
      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
    ],
-    "public/app/core/components/Select/OldFolderPicker.tsx:5381": [
+    "public/app/core/components/Select/FolderPicker.tsx:5381": [
      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
    ],
    "public/app/core/components/TagFilter/TagFilter.tsx:5381": [
@@ -1678,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"],
@@ -1908,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"]
@@ -1934,9 +1932,6 @@ exports[`better eslint`] = {
    "public/app/features/alerting/unified/components/silences/SilencesFilter.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
-    "public/app/features/alerting/unified/hooks/useAlertmanagerConfig.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
    "public/app/features/alerting/unified/hooks/useControlledFieldArray.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
@@ -2012,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"],
@@ -2027,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"],
@@ -2154,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"]
@@ -2189,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"],
@@ -2217,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"]
@@ -2240,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"],
@@ -2345,10 +2364,10 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Do not use any type assertions.", "26"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Do not use any type assertions.", "29"],
+      [0, 0, 0, "Do not use any type assertions.", "28"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "32"],
@@ -2402,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"]
@@ -2420,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"]
@@ -2463,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"],
@@ -2503,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"]
@@ -2565,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"]
@@ -2575,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"],
@@ -2691,13 +2766,6 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
    ],
-    "public/app/features/live/data/amendTimeSeries.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, "Do not use any type assertions.", "3"],
-      [0, 0, 0, "Do not use any type assertions.", "4"]
-    ],
    "public/app/features/live/index.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
@@ -2719,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"]
    ],
@@ -2904,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"],
@@ -2945,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"]
@@ -3008,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"],
@@ -3637,6 +3700,9 @@ exports[`better eslint`] = {
    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
    ],
+    "public/app/plugins/datasource/cloudwatch/components/LogsQueryEditor.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
    "public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
@@ -3813,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"]
@@ -4058,30 +4140,40 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
    ],
    "public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [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"]
    ],
    "public/app/plugins/datasource/influxdb/datasource.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.", "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, "Do not use any type assertions.", "5"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
+      [0, 0, 0, "Do not use any type assertions.", "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, "Do not use any type assertions.", "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, "Do not use any type assertions.", "18"]
+      [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"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "27"],
+      [0, 0, 0, "Do not use any type assertions.", "28"]
    ],
    "public/app/plugins/datasource/influxdb/influx_query_model.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -4146,11 +4238,23 @@ exports[`better eslint`] = {
      [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.", "16"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "17"]
    ],
    "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"],
@@ -4174,9 +4278,12 @@ exports[`better eslint`] = {
    "public/app/plugins/datasource/influxdb/specs/mocks.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.", "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"],
@@ -4416,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"],
@@ -4481,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"]
@@ -4570,11 +4679,11 @@ exports[`better eslint`] = {
      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
    ],
-    "public/app/plugins/datasource/tempo/LokiSearch.tsx:5381": [
+    "public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
      [0, 0, 0, "Do not use any type assertions.", "1"]
    ],
-    "public/app/plugins/datasource/tempo/ServiceGraphSection.tsx:5381": [
+    "public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"],
      [0, 0, 0, "Do not use any type assertions.", "1"]
    ],
@@ -4596,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"],
@@ -4628,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"],
@@ -4868,26 +4981,6 @@ exports[`better eslint`] = {
    "public/app/plugins/panel/geomap/layers/basemaps/esri.ts:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
-    "public/app/plugins/panel/geomap/layers/data/dayNightLayer.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/geomap/layers/data/heatMap.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/geomap/layers/data/markersLayer.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/geomap/layers/data/photosLayer.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
-    ],
-    "public/app/plugins/panel/geomap/layers/data/routeLayer.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"]
-    ],
    "public/app/plugins/panel/geomap/layers/registry.ts:5381": [
      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -4906,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": [
@@ -5294,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': () =>
@@ -36,11 +36,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod
 	@# Manual modification: CGo is disabled to make the Drone CLI build successfully on Darwin/arm64 machines.
 	@cd $(BINGO_DIR) && CGO_ENABLED=0 GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"

-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.3
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.52.2
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.53.3"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.52.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.52.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"

 JB := $(GOBIN)/jb-v0.5.1
 $(JB): $(BINGO_DIR)/jb.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.20

-require github.com/golangci/golangci-lint v1.53.3 // cmd/golangci-lint
+require github.com/golangci/golangci-lint v1.52.2 // cmd/golangci-lint
@@ -40,8 +40,6 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/4meepo/tagalign v1.2.2 h1:kQeUTkFTaBRtd/7jm8OKJl9iHk0gAO+TDFPHGSna0aw=
-github.com/4meepo/tagalign v1.2.2/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE=
 github.com/Abirdcfly/dupword v0.0.9 h1:MxprGjKq3yDBICXDgEEsyGirIXfMYXkLNT/agPsE1tk=
 github.com/Abirdcfly/dupword v0.0.9/go.mod h1:PzmHVLLZ27MvHSzV7eFmMXSFArWXZPZmfuuziuUrf2g=
 github.com/Abirdcfly/dupword v0.0.11 h1:z6v8rMETchZXUIuHxYNmlUAuKuB21PeaSymTed16wgU=
@@ -50,19 +48,13 @@ github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwka
 github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU=
 github.com/Antonboom/errname v0.1.9 h1:BZDX4r3l4TBZxZ2o2LNrlGxSHran4d1u4veZdoORTT4=
 github.com/Antonboom/errname v0.1.9/go.mod h1:nLTcJzevREuAsgTbG85UsuiWpMpAqbKD1HNZ29OzE58=
-github.com/Antonboom/errname v0.1.10 h1:RZ7cYo/GuZqjr1nuJLNe8ZH+a+Jd9DaZzttWzak9Bls=
-github.com/Antonboom/errname v0.1.10/go.mod h1:xLeiCIrvVNpUtsN0wxAh05bNIZpqE22/qDMnTBTttiA=
 github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q=
 github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI=
 github.com/Antonboom/nilnil v0.1.3 h1:6RTbx3d2mcEu3Zwq9TowQpQMVpP75zugwOtqY1RTtcE=
 github.com/Antonboom/nilnil v0.1.3/go.mod h1:iOov/7gRcXkeEU+EMGpBu2ORih3iyVEiWjeste1SJm8=
-github.com/Antonboom/nilnil v0.1.5 h1:X2JAdEVcbPaOom2TUa1FxZ3uyuUlex0XMLGYMemu6l0=
-github.com/Antonboom/nilnil v0.1.5/go.mod h1:I24toVuBKhfP5teihGWctrRiPbRKHwZIFOvc6v3HZXk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
@@ -72,15 +64,11 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3Q
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA=
 github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc=
-github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY=
-github.com/OpenPeeDeeP/depguard/v2 v2.1.0/go.mod h1:PUBgk35fX4i7JDmwzlJwJ+GMe6NfO1723wmJMgPThNQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alexkohler/nakedret/v2 v2.0.2 h1:qnXuZNvv3/AxkAb22q/sEsEpcA99YxLFACDtEw9TPxE=
-github.com/alexkohler/nakedret/v2 v2.0.2/go.mod h1:2b8Gkk0GsOrqQv/gPWjNLDSKwG8I5moSXG1K4VIBcTQ=
 github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
 github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
 github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
@@ -89,8 +77,6 @@ github.com/ashanbrown/forbidigo v1.4.0 h1:spdPbupaSqtWORq1Q4eHBoPBmHtwVyLKwaedbS
 github.com/ashanbrown/forbidigo v1.4.0/go.mod h1:IvgwB5Y4fzqSAj/WVXKWigoTkB0dzI2FBbpKWuh7ph8=
 github.com/ashanbrown/forbidigo v1.5.1 h1:WXhzLjOlnuDYPYQo/eFlcFMi8X/kLfvWLYu6CSoebis=
 github.com/ashanbrown/forbidigo v1.5.1/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
-github.com/ashanbrown/forbidigo v1.5.3 h1:jfg+fkm/snMx+V9FBwsl1d340BV/99kZGv5jN9hBoXk=
-github.com/ashanbrown/forbidigo v1.5.3/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
 github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s=
 github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -99,8 +85,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A=
 github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI=
-github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJY=
-github.com/bkielbasa/cyclop v1.2.1/go.mod h1:K/dT/M0FPAiYjBgQGau7tz+3TMh4FWAEqlMhzFWCrgM=
 github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M=
 github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
 github.com/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU=
@@ -115,10 +99,6 @@ github.com/breml/errchkjson v0.3.1 h1:hlIeXuspTyt8Y/UmP5qy1JocGNR00KQHgfaNtRAjox
 github.com/breml/errchkjson v0.3.1/go.mod h1:XroxrzKjdiutFyW3nWhw34VGg7kiMsDQox73yWCGI2U=
 github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY=
 github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc=
-github.com/butuzov/ireturn v0.2.0 h1:kCHi+YzC150GE98WFuZQu9yrTn6GEydO2AuPLbTgnO4=
-github.com/butuzov/ireturn v0.2.0/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc=
-github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI=
-github.com/butuzov/mirror v1.1.0/go.mod h1:8Q0BdQU6rC6WILDiBM60DBfvV78OLJmMmixe7GF45AE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -176,8 +156,6 @@ github.com/go-critic/go-critic v0.6.7 h1:1evPrElnLQ2LZtJfmNDzlieDhjnq36SLgNzisx0
 github.com/go-critic/go-critic v0.6.7/go.mod h1:fYZUijFdcnxgx6wPjQA2QEjIRaNCT0gO8bhexy6/QmE=
 github.com/go-critic/go-critic v0.7.0 h1:tqbKzB8pqi0NsRZ+1pyU4aweAF7A7QN0Pi4Q02+rYnQ=
 github.com/go-critic/go-critic v0.7.0/go.mod h1:moYzd7GdVXE2C2hYTwd7h0CPcqlUeclsyBRwMa38v64=
-github.com/go-critic/go-critic v0.8.1 h1:16omCF1gN3gTzt4j4J6fKI/HnRojhEp+Eks6EuKw3vw=
-github.com/go-critic/go-critic v0.8.1/go.mod h1:kpzXl09SIJX1cr9TB/g/sAG+eFEl7ZS9f9cqvZtyNl0=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -254,8 +232,6 @@ github.com/golangci/golangci-lint v1.51.2 h1:yIcsT1X9ZYHdSpeWXRT1ORC/FPGSqDHbHsu
 github.com/golangci/golangci-lint v1.51.2/go.mod h1:KH9Q7/3glwpYSknxUgUyLlAv46A8fsSKo1hH2wDvkr8=
 github.com/golangci/golangci-lint v1.52.2 h1:FrPElUUI5rrHXg1mQ7KxI1MXPAw5lBVskiz7U7a8a1A=
 github.com/golangci/golangci-lint v1.52.2/go.mod h1:S5fhC5sHM5kE22/HcATKd1XLWQxX+y7mHj8B5H91Q/0=
-github.com/golangci/golangci-lint v1.53.3 h1:CUcRafczT4t1F+mvdkUm6KuOpxUZTl0yWN/rSU6sSMo=
-github.com/golangci/golangci-lint v1.53.3/go.mod h1:W4Gg3ONq6p3Jl+0s/h9Gr0j7yEgHJWWZO2bHl2tBUXM=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg=
 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA=
@@ -303,8 +279,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U=
 github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
-github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8=
-github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
 github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw=
 github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=
@@ -375,16 +349,12 @@ github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs=
 github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I=
 github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g=
 github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes=
-github.com/kunwardeep/paralleltest v1.0.7 h1:2uCk94js0+nVNQoHZNLBkAR1DQJrVzw6T0RMzJn55dQ=
-github.com/kunwardeep/paralleltest v1.0.7/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY=
 github.com/kyoh86/exportloopref v0.1.11 h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ=
 github.com/kyoh86/exportloopref v0.1.11/go.mod h1:qkV4UF1zGl6EkF1ox8L5t9SwyeBAZ3qLMd6up458uqA=
 github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA=
 github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0=
 github.com/ldez/tagliatelle v0.4.0 h1:sylp7d9kh6AdXN2DpVGHBRb5guTVAgOxqNGhbqc4b1c=
 github.com/ldez/tagliatelle v0.4.0/go.mod h1:mNtTfrHy2haaBAw+VT7IBV6VXBThS7TCreYWbBcJ87I=
-github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo=
-github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4=
 github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU=
 github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY=
 github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM=
@@ -417,8 +387,6 @@ github.com/mgechev/revive v1.2.5 h1:UF9AR8pOAuwNmhXj2odp4mxv9Nx2qUIwVz8ZsU+Mbec=
 github.com/mgechev/revive v1.2.5/go.mod h1:nFOXent79jMTISAfOAasKfy0Z2Ejq0WX7Qn/KAdYopI=
 github.com/mgechev/revive v1.3.1 h1:OlQkcH40IB2cGuprTPcjB0iIUddgVZgGmDX3IAMR8D4=
 github.com/mgechev/revive v1.3.1/go.mod h1:YlD6TTWl2B8A103R9KWJSPVI9DrEf+oqr15q21Ld+5I=
-github.com/mgechev/revive v1.3.2 h1:Wb8NQKBaALBJ3xrrj4zpwJwqwNA6nDpyJSEQWcCka6U=
-github.com/mgechev/revive v1.3.2/go.mod h1:UCLtc7o5vg5aXCwdUTU1kEBQ1v+YXPAkYDIDXbrs5I0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -440,16 +408,12 @@ github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6Fx
 github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8=
 github.com/nishanths/exhaustive v0.9.5 h1:TzssWan6orBiLYVqewCG8faud9qlFntJE30ACpzmGME=
 github.com/nishanths/exhaustive v0.9.5/go.mod h1:IbwrGdVMizvDcIxPYGVdQn5BqWJaOwpCvg4RGb8r/TA=
-github.com/nishanths/exhaustive v0.11.0 h1:T3I8nUGhl/Cwu5Z2hfc92l0e04D2GEW6e0l8pzda2l0=
-github.com/nishanths/exhaustive v0.11.0/go.mod h1:RqwDsZ1xY0dNdqHho2z6X+bgzizwbLYOWnZbbl2wLB4=
 github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk=
 github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
 github.com/nunnatsa/ginkgolinter v0.8.1 h1:/y4o/0hV+ruUHj4xXh89xlFjoaitnI4LnkpuYs02q1c=
 github.com/nunnatsa/ginkgolinter v0.8.1/go.mod h1:FYYLtszIdmzCH8XMaMPyxPVXZ7VCaIm55bA+gugx+14=
 github.com/nunnatsa/ginkgolinter v0.9.0 h1:Sm0zX5QfjJzkeCjEp+t6d3Ha0jwvoDjleP9XCsrEzOA=
 github.com/nunnatsa/ginkgolinter v0.9.0/go.mod h1:FHaMLURXP7qImeH6bvxWJUpyH+2tuqe5j4rW1gxJRmI=
-github.com/nunnatsa/ginkgolinter v0.12.1 h1:vwOqb5Nu05OikTXqhvLdHCGcx5uthIYIl0t79UVrERQ=
-github.com/nunnatsa/ginkgolinter v0.12.1/go.mod h1:AK8Ab1PypVrcGUusuKD8RDcl2KgsIwvNaaxAlyHSzso=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
@@ -472,8 +436,6 @@ github.com/polyfloyd/go-errorlint v1.1.0 h1:VKoEFg5yxSgJ2yFPVhxW7oGz+f8/OVcuMeNv
 github.com/polyfloyd/go-errorlint v1.1.0/go.mod h1:Uss7Bc/izYG0leCMRx3WVlrpqWedSZk7V/FUQW6VJ6U=
 github.com/polyfloyd/go-errorlint v1.4.0 h1:b+sQ5HibPIAjEZwtuwU8Wz/u0dMZ7YL+bk+9yWyHVJk=
 github.com/polyfloyd/go-errorlint v1.4.0/go.mod h1:qJCkPeBn+0EXkdKTrUCcuFStM2xrDKfxI3MGLXPexUs=
-github.com/polyfloyd/go-errorlint v1.4.2 h1:CU+O4181IxFDdPH6t/HT7IiDj1I7zxNi1RIUxYwn8d0=
-github.com/polyfloyd/go-errorlint v1.4.2/go.mod h1:k6fU/+fQe38ednoZS51T7gSIGQW1y94d6TkSr35OzH8=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -520,8 +482,6 @@ github.com/sashamelentyev/usestdlibvars v1.23.0 h1:01h+/2Kd+NblNItNeux0veSL5cBF1
 github.com/sashamelentyev/usestdlibvars v1.23.0/go.mod h1:YPwr/Y1LATzHI93CqoPUN/2BzGQ/6N/cl/KwgR0B/aU=
 github.com/securego/gosec/v2 v2.15.0 h1:v4Ym7FF58/jlykYmmhZ7mTm7FQvN/setNm++0fgIAtw=
 github.com/securego/gosec/v2 v2.15.0/go.mod h1:VOjTrZOkUtSDt2QLSJmQBMWnvwiQPEjg0l+5juIqGk8=
-github.com/securego/gosec/v2 v2.16.0 h1:Pi0JKoasQQ3NnoRao/ww/N/XdynIB9NRYYZT5CyOs5U=
-github.com/securego/gosec/v2 v2.16.0/go.mod h1:xvLcVZqUfo4aAQu56TNv7/Ltz6emAOQAEsrZrt7uGlI=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
@@ -531,12 +491,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI=
 github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw=
-github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE=
-github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4=
 github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8=
 github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY=
 github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak=
@@ -553,8 +509,6 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
 github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
-github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -582,8 +536,6 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8=
@@ -598,8 +550,6 @@ github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw=
 github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8=
 github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e h1:MV6KaVu/hzByHP0UvJ4HcMGE/8a6A4Rggc/0wx2AvJo=
 github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
-github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
-github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
 github.com/timonwong/loggercheck v0.9.3 h1:ecACo9fNiHxX4/Bc02rW2+kaJIAMAes7qJ7JKxt0EZI=
 github.com/timonwong/loggercheck v0.9.3/go.mod h1:wUqnk9yAOIKtGA39l1KLE9Iz0QiTocu/YZoOf+OzFdw=
 github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4=
@@ -616,14 +566,10 @@ github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqz
 github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
 github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y=
 github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY=
-github.com/xen0n/gosmopolitan v1.2.1 h1:3pttnTuFumELBRSh+KQs1zcz4fN6Zy7aB0xlnQSn1Iw=
-github.com/xen0n/gosmopolitan v1.2.1/go.mod h1:JsHq/Brs1o050OOdmzHeOr0N7OtlnKRAGAsElF8xBQA=
 github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
 github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=
 github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o=
 github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA=
-github.com/ykadowak/zerologlint v0.1.2 h1:Um4P5RMmelfjQqQJKtE8ZW+dLZrXrENeIzWWKw800U4=
-github.com/ykadowak/zerologlint v0.1.2/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -639,8 +585,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.tmz.dev/musttag v0.7.0 h1:QfytzjTWGXZmChoX0L++7uQN+yRCPfyFm+whsM+lfGc=
-go.tmz.dev/musttag v0.7.0/go.mod h1:oTFPvgOkJmp5kYL02S8+jrH0eLrBIl57rzWeA26zDEM=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
@@ -671,8 +615,6 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
-golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4=
-golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 h1:6WHiuFL9FNjg8RljAaT7FNUuKDbvMqS1i5cr2OE2sLQ=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
@@ -711,8 +653,6 @@ golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -779,8 +719,6 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -843,8 +781,6 @@ golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -866,8 +802,6 @@ golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -950,8 +884,6 @@ golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1080,8 +1012,6 @@ honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw=
 honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
 mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM=
 mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ=
-mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E=
-mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=
@@ -1,138 +1,86 @@
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
-github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
-github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
-github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
-github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU=
 github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
-github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo=
 github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8=
 github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
-github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
 github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4=
-github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs=
 github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
 github.com/go-openapi/loads v0.21.0 h1:jYtUO4wwP7psAweisP/MDoOpdzsYEESdoPcsWjHDR68=
 github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro=
-github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw=
 github.com/go-openapi/runtime v0.21.1 h1:/KIG00BzA2x2HRStX2tnhbqbQdPcFlkgsYCiNY20FZs=
 github.com/go-openapi/runtime v0.24.1 h1:Sml5cgQKGYQHF+M7yYSHaH1eOjvTykrddTE/KtQVjqo=
-github.com/go-openapi/runtime v0.24.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk=
 github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M=
 github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI=
-github.com/go-openapi/spec v0.20.7/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
 github.com/go-openapi/strfmt v0.21.1 h1:G6s2t5V5kGCHLVbSdZ/6lI8Wm4OzoPFkc3/cjAsKQrM=
 github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o=
-github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
 github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
 github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-openapi/validate v0.20.3 h1:GZPPhhKSZrE8HjB4eEkoYAZmoWA4+tCemSgINH1/vKw=
 github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y=
-github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-swagger/go-swagger v0.29.0 h1:z3YoZtLvS1Y8TE/PCat1VypcZxM0IgKLt0NvZxQyNl8=
 github.com/go-swagger/go-swagger v0.29.0/go.mod h1:Z4GJzI+bHKKkGB2Ji1rawpi3/ldXX8CkzGIa9HAC5EE=
 github.com/go-swagger/go-swagger v0.30.2 h1:23odPUyQZdkNFZZSBJ3mqYYcdh+LnuReEbdWN18OMRo=
 github.com/go-swagger/go-swagger v0.30.2/go.mod h1:neDPes8r8PCz2JPvHRDj8BTULLh4VJUt7n6MpQqxhHM=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
-github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
-github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
-github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
-github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
-github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60=
 github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
 github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
-github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
-github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
 github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ=
-github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM=
 go.mongodb.org/mongo-driver v1.8.2 h1:8ssUXufb90ujcIvR6MyE1SchaNj0SFxsakiZgxIyrMk=
 go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4=
-go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8=
 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
-golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
 golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 gopkg.in/ini.v1 v1.66.3 h1:jRskFVxYaMGAMUbN0UZ7niA9gzL9B49DOqE78vg0k3w=
 gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
-gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -14,7 +14,7 @@ CUE="${GOBIN}/cue-v0.5.0"

 DRONE="${GOBIN}/drone-v1.5.0"

-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.53.3"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.52.2"

 JB="${GOBIN}/jb-v0.5.1"

@@ -1294,7 +1294,7 @@ This option to group query variable values into groups by tags has been an exper
 **Deprecation warnings**

 - Scripted dashboards is now deprecated. The feature is not removed but will be in a future release. We hope to address the underlying requirement of dynamic dashboards in a different way. [#24059](https://github.com/grafana/grafana/issues/24059)
- The unofficial first version of backend plugins together with usage of [grafana/grafana-plugin-model](https://github.com/grafana/grafana-plugin-model) is now deprecated and support for that will be removed in a future release. Please refer to [backend plugins documentation](/developers/plugin-tools/introduction/backend-plugins) for information about the new officially supported backend plugins.
+- The unofficial first version of backend plugins together with usage of [grafana/grafana-plugin-model](https://github.com/grafana/grafana-plugin-model) is now deprecated and support for that will be removed in a future release. Please refer to [backend plugins documentation](https://grafana.com/docs/grafana/latest/developers/plugins/backend/) for information about the new officially supported backend plugins.

 ## 7.0 Feature highlights

@@ -1,5 +0,0 @@
-aks
-eror
-iam
-wan
-operato
@@ -7,47 +7,67 @@
 This module returns a Drone configuration including pipelines and secrets.
 """

-load("scripts/drone/events/cron.star", "cronjobs")
-load("scripts/drone/events/main.star", "main_pipelines")
 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",
    "publish_npm_pipelines",
    "publish_packages_pipeline",
-)
-load(
-    "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_windows_test_image_pipeline",
-)
-load(
-    "scripts/drone/pipelines/publish_images.star",
-    "publish_image_pipelines_public",
-)
-load(
-    "scripts/drone/pipelines/windows.star",
-    "windows_test_backend",
+    "verify_release_pipeline",
 )
 load(
    "scripts/drone/rgm.star",
    "rgm",
 )
+load(
+    "scripts/drone/pipelines/publish_images.star",
+    "publish_image_pipelines_public",
+    "publish_image_pipelines_security",
+)
+load(
+    "scripts/drone/pipelines/ci_images.star",
+    "publish_ci_windows_test_image_pipeline",
+)
+load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
+load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
+load(
+    "scripts/drone/pipelines/windows.star",
+    "windows_test_backend",
+)
+load("scripts/drone/version.star", "version_branch_pipelines")
+load("scripts/drone/events/cron.star", "cronjobs")
 load("scripts/drone/vault.star", "secrets")

 def main(_ctx):
    return (
        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() +
+        [verify_release_pipeline()] +
        rgm() +
        [windows_test_backend({
            "event": ["promote"],
            "target": ["test-windows"],
        }, "oss", "testing")] +
+        artifacts_page_pipeline() +
+        version_branch_pipelines() +
        integration_test_pipelines() +
        publish_ci_windows_test_image_pipeline() +
        cronjobs() +
@@ -3,23 +3,23 @@
 .yarn
 build
 compiled
-/data
+data
 deployment_tools_config.json
-/devenv
+devenv
 dist
-/e2e/tmp
+e2e/tmp
 node_modules
-/pkg
-/public/lib/monaco
-/scripts/grafana-server/tmp
+pkg
+public/lib/monaco
+scripts/grafana-server/tmp
 vendor

 # TS generate from cue by cuetsy
 **/*.gen.ts

 # Auto-generated internationalization files
-/public/locales/_build/
-/public/locales/**/*.js
+public/locales/_build/
+public/locales/**/*.js

 # Auto-generated icon file
-/packages/grafana-ui/src/components/Icon/iconBundle.ts
+packages/grafana-ui/src/components/Icon/iconBundle.ts
@@ -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",
          {
@@ -88,39 +96,6 @@
          }
        ]
      }
-    },
-    {
-      "files": [
-        "public/app/plugins/datasource/testdata/*.{ts,tsx}",
-        "public/app/plugins/datasource/testdata/**/*.{ts,tsx}"
-      ],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              // generic rules
-              {
-                "name": "react-redux",
-                "importNames": ["useDispatch", "useSelector"],
-                "message": "Please import from app/types instead."
-              },
-              {
-                "name": "react-i18next",
-                "importNames": ["Trans", "t"],
-                "message": "Please import from app/core/internationalization instead"
-              }
-            ],
-            // new rules
-            "patterns": [
-              {
-                "group": ["**/app/*"],
-                "message": "Core plugins are not allowed to depend on Grafana core packages"
-              }
-            ]
-          }
-        ]
-      }
    }
  ]
 }
@@ -13,8 +13,7 @@

 # Documentation
 /.changelog-archive @grafana/docs-grafana
-/.codespellignore @grafana/docs-tooling
-/CHANGELOG.md @grafana/grafana-release-guild
+/CHANGELOG.md @grafana/docs-grafana
 /CODE_OF_CONDUCT.md @grafana/docs-grafana
 /CONTRIBUTING.md @grafana/docs-grafana
 /GOVERNANCE.md @RichiH
@@ -34,25 +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/                                                @jdbaldry
-/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/                                    @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
@@ -87,6 +84,7 @@
 /pkg/infra/metrics/ @grafana/backend-platform
 /pkg/infra/network/ @grafana/backend-platform
 /pkg/infra/process/ @grafana/backend-platform
+/pkg/infra/proxy/ @grafana/hosted-grafana-team
 /pkg/infra/remotecache/ @grafana/backend-platform
 /pkg/infra/serverlock/ @grafana/backend-platform
 /pkg/infra/slugify/ @grafana/backend-platform
@@ -98,7 +96,6 @@
 /pkg/server/ @grafana/backend-platform
 /pkg/services/annotations/ @grafana/backend-platform
 /pkg/services/apikey/ @grafana/grafana-authnz-team
-/pkg/services/certgenerator @grafana/grafana-app-platform-squad
 /pkg/services/cleanup/ @grafana/backend-platform
 /pkg/services/contexthandler/ @grafana/backend-platform
 /pkg/services/correlations/ @grafana/backend-platform
@@ -108,7 +105,6 @@
 /pkg/services/dashboardversion/ @grafana/backend-platform
 /pkg/services/encryption/ @grafana/backend-platform
 /pkg/services/folder/ @grafana/backend-platform
-/pkg/services/grafana-apiserver @grafana/grafana-app-platform-squad
 /pkg/services/hooks/ @grafana/backend-platform
 /pkg/services/kmsproviders/ @grafana/backend-platform
 /pkg/services/licensing/ @grafana/backend-platform
@@ -146,7 +142,6 @@
 /pkg/tsdb/legacydata/ @grafana/backend-platform
 /pkg/tsdb/opentsdb/ @grafana/backend-platform
 /pkg/tsdb/sqleng/ @grafana/backend-platform
-/pkg/tsdb/sqleng/proxyutil @grafana/hosted-grafana-team
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform

@@ -163,17 +158,16 @@
 # Logs code, developers environment
 /devenv/docker/blocks/loki* @grafana/observability-logs
 /devenv/docker/blocks/elastic* @grafana/observability-logs
-/devenv/docker/blocks/self-instrumentation* @grafana/observability-metrics

 /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
@@ -183,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
@@ -211,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
@@ -221,22 +215,22 @@
 /devenv/setup.sh @grafana/backend-platform

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

 #Packaging
 /packaging/ @DanCech


 # Continuous Integration
-.drone.yml @grafana/grafana-release-guild
-.drone.star @grafana/grafana-release-guild
-/scripts/drone/ @grafana/grafana-release-guild
-/pkg/build/ @grafana/grafana-release-guild
-/.dockerignore @grafana/grafana-release-guild
-/Dockerfile @grafana/grafana-release-guild
-/Makefile @grafana/grafana-release-guild
-/scripts/build/ @grafana/grafana-release-guild
-/scripts/list-release-artifacts.sh @grafana/grafana-release-guild
+.drone.yml @grafana/grafana-delivery
+.drone.star @grafana/grafana-delivery
+/scripts/drone/ @grafana/grafana-delivery
+/pkg/build/ @grafana/grafana-delivery
+/.dockerignore @grafana/grafana-delivery
+/Dockerfile @grafana/grafana-delivery
+/Makefile @grafana/grafana-delivery
+/scripts/build/ @grafana/grafana-delivery
+/scripts/list-release-artifacts.sh @grafana/grafana-delivery

 # OSS Plugin Partnerships backend code
 /pkg/tsdb/cloudwatch/ @grafana/aws-datasources
@@ -272,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
@@ -310,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
@@ -358,7 +352,6 @@ lerna.json @grafana/frontend-ops
 /public/app/core/ @grafana/grafana-frontend-platform
 /public/app/core/components/TimePicker/ @grafana/grafana-frontend-platform
 /public/app/core/components/Layers/ @grafana/dataviz-squad
-/public/app/core/components/TraceToLogs @grafana/observability-traces-and-profiling
 /public/app/features/all.ts @grafana/grafana-frontend-platform
 /public/app/features/admin/ @grafana/grafana-authnz-team
 /public/app/features/auth-config/ @grafana/grafana-authnz-team
@@ -368,10 +361,10 @@ lerna.json @grafana/frontend-ops
 /public/app/features/geo/ @grafana/dataviz-squad
 /public/app/features/visualization/data-hover/ @grafana/dataviz-squad
 /public/app/features/commandPalette/ @grafana/grafana-frontend-platform
-/public/app/features/connections/ @grafana/plugins-platform-frontend @mikkancso
+/public/app/features/connections/ @grafana/plugins-platform-frontend
 /public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/datasources/ @grafana/plugins-platform-frontend @mikkancso
+/public/app/features/datasources/ @grafana/plugins-platform-frontend
 /public/app/features/dimensions/ @grafana/dataviz-squad
 /public/app/features/dataframe-import/ @grafana/grafana-bi-squad
 /public/app/features/explore/ @grafana/explore-squad
@@ -385,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
@@ -402,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
@@ -419,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
@@ -431,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
@@ -441,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
@@ -450,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
@@ -475,26 +469,26 @@ lerna.json @grafana/frontend-ops

 /scripts/benchmark-access-control.sh @grafana/grafana-authnz-team
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
-/scripts/ci-* @grafana/grafana-release-guild
-/scripts/circle-* @grafana/grafana-release-guild
-/scripts/publish-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
-/scripts/validate-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
+/scripts/ci-* @grafana/grafana-delivery
+/scripts/circle-* @grafana/grafana-delivery
+/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
+/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
 /scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
 /scripts/grafana-server/ @grafana/grafana-frontend-platform
-/scripts/helpers/ @grafana/grafana-release-guild
+/scripts/helpers/ @grafana/grafana-delivery
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
 /scripts/openapi3/ @grafana/grafana-operator-experience-squad
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
-/scripts/tag_release.sh @grafana/grafana-release-guild
-/scripts/trigger_docker_build.sh @grafana/grafana-release-guild
-/scripts/trigger_grafana_packer.sh @grafana/grafana-release-guild
-/scripts/trigger_windows_build.sh @grafana/grafana-release-guild
-/scripts/verify-repo-update/ @grafana/grafana-release-guild
+/scripts/tag_release.sh @grafana/grafana-delivery
+/scripts/trigger_docker_build.sh @grafana/grafana-delivery
+/scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
+/scripts/trigger_windows_build.sh @grafana/grafana-delivery
+/scripts/verify-repo-update/ @grafana/grafana-delivery

 /scripts/webpack/ @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
@@ -594,18 +588,17 @@ embed.go @grafana/grafana-as-code
 /.github/pr-commands.json @marefr
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
-/.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend-product
-/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild
-/.github/workflows/backport.yml @grafana/grafana-release-guild
-/.github/workflows/bump-version.yml @grafana/grafana-release-guild
-/.github/workflows/close-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/backport.yml @grafana/grafana-delivery
+/.github/workflows/bump-version.yml @grafana/grafana-delivery
+/.github/workflows/close-milestone.yml @grafana/grafana-delivery
+/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-datasources @grafana/aws-datasources
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.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 @grafana/grafana-release-guild
+/.github/workflows/github-release.yml @torkelo
 /.github/workflows/issue-labeled.yml @armandgrillet
 /.github/workflows/issue-opened.yml @grafana/grafana-community-support
 /.github/workflows/metrics-collector.yml @torkelo
@@ -617,27 +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-release-guild
-/.github/workflows/sync-mirror.yml @grafana/grafana-release-guild
-/.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-release-guild
+/.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-release-guild
-/.github/workflows/update-changelog.yml @grafana/grafana-release-guild
-/.github/workflows/update-make-docs.yml @grafana/docs-tooling
+/.github/workflows/stale.yml @grafana/grafana-frontend-platform
+/.github/workflows/update-changelog.yml @grafana/grafana-delivery
 /.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-pr-comment.yml @grafana/grafana-operator-experience-squad
-/.github/workflows/ephemeral-instances-pr-opened-closed.yml @grafana/grafana-operator-experience-squad
-/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild
-

 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -652,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
@@ -9,8 +9,8 @@ Comment commands:

 Label commands:

-* Add label `bot/question` the bot will close with standard question message and add label `type/question`
-* Add label `bot/duplicate` the bot will close with standard duplicate message and add label `type/duplicate`
+* Add label `bot/question` the the bot will close with standard question message and add label `type/question`
+* Add label `bot/duplicate` the the bot will close with standard duplicate message and add label `type/duplicate`
 * Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above)
 * Add label `bot/close feature request` for bot to close a feature request with standard message and adds label `not implemented`
 * Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
@@ -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"
    }
  },
  {
@@ -46,4 +46,4 @@
    },
    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#include-in-changelog-and-release-notes"
  }
-]
+]
@@ -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"
-    }
  }
 ]
@@ -1,37 +0,0 @@
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 1'
-
-jobs:
-  gen-swagger:
-    name: Alerting Swagger spec generation cron job
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - name: Set go version
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.21.8'
-      - name: Build swagger
-        run: |
-          make -C pkg/services/ngalert/api/tooling post.json api.json
-      - name: Open Pull Request
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "chore: update alerting swagger spec"
-          title: "Alerting: Update Swagger spec"
-          body: |
-            This is an automated pull request to update the alerting swagger spec.
-            Please review and merge.
-          branch: update-alerting-swagger-spec
-          delete-branch: true
-          labels: 'area/alerting,type/docs,no-backport,no-changelog'
-          team-reviewers: 'grafana/alerting-backend-product'
-          draft: false
-
@@ -1,24 +0,0 @@
-name: Auto-milestone
-on:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - closed
-
-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 auto-milestone
-        uses: grafana/grafana-github-actions-go/auto-milestone@main
-        with:
-          pr: ${{ github.event.pull_request.number }}
-          token: ${{ steps.generate_token.outputs.token }}
@@ -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,30 +49,27 @@ 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:
          repository: "grafana/grafana-github-actions"
          path: ./actions
          ref: main
-      # Go is required for also updating the schema versions as part of the precommit hook:
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'
      - uses: actions/setup-node@v3.5.1
        with:
          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 }}
-          precommit_make_target: gen-cue
@@ -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 }}
@@ -0,0 +1,18 @@
+name: Cloud data sources test code coverage
+on:
+  pull_request:
+    paths:
+      - 'pkg/tsdb/azuremonitor/**'
+      - 'pkg/tsdb/cloud-monitoring/**'
+      - 'public/app/plugins/datasource/azuremonitor/**'
+      - 'public/app/plugins/datasource/cloud-monitoring/**'
+    branches-ignore:
+      - dependabot/**
+      - backport-*
+
+jobs:
+  workflow-call:
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.19
+    with:
+      frontend-path-regexp: public\/app\/plugins\/datasource\/(azuremonitor|cloud-monitoring)
+      backend-path-regexp: pkg\/tsdb\/(azuremonitor|cloud-monitoring)
@@ -44,7 +44,7 @@ jobs:
      name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.21.8'
+        go-version: '1.20.4'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
@@ -1,28 +0,0 @@
-# Owned by grafana-release-guild
-# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror.
-name: Create security patch
-run-name: create-security-patch
-on:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-    branches:
-      - "main"
-      - "v*.*.*"
-
-# This is run before the pull request has been merged, so we'll run against the src branch
-jobs:
-  trigger_downstream_create_security_patch:
-    concurrency: create-patch-${{ github.ref_name }}
-    uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main
-    if: github.repository == 'grafana/grafana-security-mirror'
-    with:
-      repo: "${{ github.repository }}"
-      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
-      patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main"
-      patch_repo: "grafana/grafana-security-patches"
-      patch_prefix: "${{ github.event.pull_request.number }}"
-    secrets: inherit
-
@@ -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:v4.0.0"
+      image: "grafana/doc-validator:v3.0.0"
    steps:
      - name: "Checkout code"
        uses: "actions/checkout@v3"
@@ -1,51 +0,0 @@
-name: 'Ephemeral instances: PR comment'
-on:
-  issue_comment:
-    types: [created]
-jobs:      
-  handle-pull-request-event:
-    if: github.event.sender.type == 'User' && 
-        github.event.issue.pull_request &&
-        startsWith(github.event.comment.body, '/deploy-to-hg')
-    runs-on: 
-      labels: ubuntu-latest-8-cores
-    continue-on-error: true
-    steps:        
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '>=1.20'
-
-      - name: Generate a GitHub app installation token
-        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
-        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-oss-${{ github.event.issue.number}}-${{ github.run_number }}-${{ github.run_attempt }}" \
-            -REGISTRY="${{ secrets.EI_EPHEMERAL_INSTANCES_REGISTRY }}" \
-            -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
@@ -1,69 +0,0 @@
-name: 'Ephemeral instances: PR opened/closed'
-on:
-  pull_request:
-      types: [opened, reopened, closed]
-jobs:
-  config:
-    runs-on: "ubuntu-latest"
-    outputs:
-      has-secrets: ${{ steps.check.outputs.has-secrets }}
-    steps:
-      - name: "Check for secrets"
-        id: check
-        shell: bash
-        run: |
-          if [ -n "${{ (secrets.EI_APP_ID != '' &&
-                        secrets.EI_APP_PRIVATE_KEY != '' &&
-                        secrets.EI_GCOM_HOST != '' &&
-                        secrets.EI_GCOM_TOKEN != '' &&
-                        secrets.EI_EPHEMERAL_INSTANCES_REGISTRY != '' &&
-                        secrets.EI_GCP_SERVICE_ACCOUNT_KEY_BASE64 != '' &&
-                        secrets.EI_EPHEMERAL_ORG_ID != ''
-                        ) || '' }}" ]; then
-            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
-          fi
-
-  handle-pull-request-event:
-    needs: config
-    if: needs.config.outputs.has-secrets
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '>=1.20'
-
-      - name: Generate a GitHub app installation token
-        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@v4
-        with:
-          repository: grafana/ephemeral-grafana-instances-github-action
-          token: ${{ steps.generate_token.outputs.token }}
-          ref: main
-          path: ephemeral
-
-      - name: Run action
-        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="unused" \
-            -REGISTRY="${{ secrets.EI_EPHEMERAL_INSTANCES_REGISTRY }}" \
-            -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,24 +3,22 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        required: true
+        required: true        
        description: Needs to match, exactly, the name of a milestone (NO v prefix)
-      latest:
-        required: false
-        description: Mark this release as latest (`1`) or not (`0`, default)
 jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+      - name: Checkout Actions
+        uses: actions/checkout@v3
        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - name: Create GitHub release (manually invoked)
-        uses: grafana/grafana-github-actions-go/github-release@main
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main    
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run github release action
+        uses: ./actions/github-release
        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          version: ${{ inputs.version }}
-          metrics_api_key: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
@@ -54,7 +54,7 @@ jobs:
        with:
          username: ${{ github.event.issue.user.login }}
          team: "${{ env.TEAM }}"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_BOT_ACCESS_TOKEN }}

      - name: "Send Slack notification"
        if: ${{ (env.CHANNEL != 'null') && ((steps.checkUserMember.outputs.isTeamMember == 'false') || (env.TEAM != 'null')) }}
@@ -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.21.8'
+        go-version: '1.20.4'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
@@ -8,44 +8,20 @@ on:
 concurrency:
  group: pr-commands-${{ github.event.number }}
 jobs:
-  config:
-    runs-on: "ubuntu-latest"
-    outputs:
-      has-secrets: ${{ steps.check.outputs.has-secrets }}
-    steps:
-      - name: "Check for secrets"
-        id: check
-        shell: bash
-        run: |
-          if [ -n "${{ (secrets.GRAFANA_PR_AUTOMATION_APP_ID != '' &&
-                        secrets.GRAFANA_PR_AUTOMATION_APP_PEM != '' &&
-                        secrets.GRAFANA_MISC_STATS_API_KEY != ''
-                        ) || '' }}" ]; then
-            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
-          fi
-
  main:
-    needs: config
-    if: needs.config.outputs.has-secrets
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Actions
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          repository: "grafana/grafana-github-actions"
          path: ./actions
          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_PR_AUTOMATION_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
      - name: Run Commands
        uses: ./actions/commands
        with:
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
          configPath: pr-commands
@@ -1,26 +0,0 @@
-# Owned by grafana-release-guild
-# 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:
-    types:
-      - opened
-      - reopened
-      - synchronize
-    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,48 +0,0 @@
-name: "publish-kinds-next"
-
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - '**/*.cue'
-  workflow_dispatch:
-
-jobs:
-  main:
-    if: github.repository == 'grafana/grafana'
-    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.21.8'
-
-      - name: "Verify kinds"
-        run: go run .github/workflows/scripts/kinds/verify-kinds.go
-
-      - 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:
-    if: github.repository == 'grafana/grafana'
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-        with:
-          # required for the `grafana/grafana-github-actions/has-matching-release-tag` action to work
-          fetch-depth: 0
-
-      - name: "Setup Go"
-        uses: "actions/setup-go@v4"
-        with:
-          go-version: '1.21.8'
-
-      - name: "Verify kinds"
-        run: go run .github/workflows/scripts/kinds/verify-kinds.go
-
-      - 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,425 +0,0 @@
-package main
-
-import (
-	"archive/zip"
-	"context"
-	"fmt"
-	"io"
-	"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 corek []kindsys.Kind
-	var compok []kindsys.Composable
-
-	kindRegistry, err := NewKindRegistry()
-	defer kindRegistry.cleanUp()
-	if err != nil {
-		die(err)
-	}
-
-	// Search for the latest version directory present in the kind-registry repo
-	latestRegistryDir, err := kindRegistry.findLatestDir()
-	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() {
-		name := kind.Props().Common().MachineName
-		err := verifyKind(kindRegistry, kind, name, "core", latestRegistryDir)
-		if err != nil {
-			errs = append(errs, err)
-			continue
-		}
-
-		corek = append(corek, kind)
-	}
-
-	for _, pp := range corelist.New(nil) {
-		for _, kind := range pp.ComposableKinds {
-			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(kindRegistry, 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()
-	outputPath := filepath.Join(".github", "workflows", "scripts", "kinds")
-
-	coreJennies := codejen.JennyList[kindsys.Kind]{}
-	coreJennies.Append(
-		KindRegistryJenny(outputPath),
-	)
-	corefs, err := coreJennies.GenerateFS(corek...)
-	die(err)
-	die(jfs.Merge(corefs))
-
-	composableJennies := codejen.JennyList[kindsys.Composable]{}
-	composableJennies.Append(
-		ComposableKindRegistryJenny(outputPath),
-	)
-	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")
-		}
-		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(registry *kindRegistry, kind kindsys.Kind, name string, category string, latestRegistryDir string) error {
-	oldKindString, err := registry.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
-}
-
-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(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) codegen.OneToOne {
-	return &kindregjenny{
-		path: path,
-	}
-}
-
-type kindregjenny struct {
-	path string
-}
-
-func (j *kindregjenny) JennyName() string {
-	return "KindRegistryJenny"
-}
-
-func (j *kindregjenny) Generate(kind kindsys.Kind) (*codejen.File, error) {
-	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) codejen.OneToOne[kindsys.Composable] {
-	return &ckrJenny{
-		path: path,
-	}
-}
-
-type ckrJenny struct {
-	path string
-}
-
-func (j *ckrJenny) JennyName() string {
-	return "ComposableKindRegistryJenny"
-}
-
-func (j *ckrJenny) Generate(k kindsys.Composable) (*codejen.File, error) {
-	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 grafanaplugin\n\n%s", newKindBytes))
-
-	return codejen.NewFile(filepath.Join(j.path, "next", "composable", name+".cue"), newKindBytes, j), nil
-}
-
-type kindRegistry struct {
-	zipDir  string
-	zipFile *zip.ReadCloser
-}
-
-// NewKindRegistry downloads the archive of the kind-registry GH repository and open it
-func NewKindRegistry() (*kindRegistry, error) {
-	ctx := context.Background()
-	tc := oauth2.NewClient(ctx, nil)
-	client := github.NewClient(tc)
-
-	// Create a temporary file to store the downloaded archive
-	file, err := os.CreateTemp("", "*.zip")
-	if err != nil {
-		return nil, fmt.Errorf("failed to create temporary file: %w", err)
-	}
-	defer file.Close()
-
-	// Get the repository archive URL
-	archiveURL, _, err := client.Repositories.GetArchiveLink(ctx, GITHUB_OWNER, GITHUB_REPO, github.Zipball, &github.RepositoryContentGetOptions{})
-	if err != nil {
-		return nil, fmt.Errorf("failed to get archive URL: %w", err)
-	}
-
-	// Download the archive file
-	httpClient := http.DefaultClient
-	resp, err := httpClient.Get(archiveURL.String())
-	if err != nil {
-		return nil, fmt.Errorf("failed to download archive: %w", err)
-	}
-	defer resp.Body.Close()
-
-	// Save the downloaded archive to the temporary file
-	_, err = io.Copy(file, resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to save archive: %w", err)
-	}
-
-	// Open the zip file for reading
-	zipDir := file.Name()
-	zipFile, err := zip.OpenReader(zipDir)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open zip file %s: %w", zipDir, err)
-	}
-
-	return &kindRegistry{
-		zipDir:  zipDir,
-		zipFile: zipFile,
-	}, nil
-}
-
-// cleanUp removes the archive from the temporary files and closes the zip reader
-func (registry *kindRegistry) cleanUp() {
-	if registry.zipDir != "" {
-		err := os.Remove(registry.zipDir)
-		if err != nil {
-			fmt.Fprint(os.Stderr, fmt.Errorf("failed to remove zip archive: %w", err))
-		}
-	}
-
-	if registry.zipFile != nil {
-		err := registry.zipFile.Close()
-		if err != nil {
-			fmt.Fprint(os.Stderr, fmt.Errorf("failed to close zip file reader: %w", err))
-		}
-	}
-}
-
-// findLatestDir get the latest version directory published in the kind registry
-func (registry *kindRegistry) findLatestDir() (string, error) {
-	re := regexp.MustCompile(`([0-9]+)\.([0-9]+)\.([0-9]+)`)
-	latestVersion := []uint64{0, 0, 0}
-	latestDir := ""
-
-	for _, file := range registry.zipFile.File {
-		if !file.FileInfo().IsDir() {
-			continue
-		}
-
-		parts := re.FindStringSubmatch(file.Name)
-		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 = file.Name
-		}
-	}
-
-	return latestDir, nil
-}
-
-// getPublishedKind retrieves the latest published kind from the kind registry
-func (registry *kindRegistry) getPublishedKind(name string, category string, latestRegistryDir string) (string, error) {
-	if latestRegistryDir == "" {
-		return "", nil
-	}
-
-	var cueFilePath string
-	switch category {
-		case "core":
-			cueFilePath = fmt.Sprintf("%s/%s.cue", name, name)
-		case "composable":
-			cueFilePath = fmt.Sprintf("%s.cue", name)
-		default:
-		return "", fmt.Errorf("kind can only be core or composable")
-	}
-
-	kindPath := filepath.Join(latestRegistryDir, category, cueFilePath)
-	file, err := registry.zipFile.Open(kindPath)
-	if err != nil {
-		return "", fmt.Errorf("failed to open file: %w", err)
-	}
-	defer file.Close()
-
-	data, err := io.ReadAll(file)
-	if err != nil {
-		return "", fmt.Errorf("failed to read file: %w", err)
-	}
-
-	return string(data), nil
-}
@@ -1,25 +0,0 @@
-# Owned by grafana-release-guild
-# Intended to be dropped into the base repo, Ex: grafana/grafana
-name: Sync to mirror
-run-name: sync-to-mirror-${{ github.ref_name }}
-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_name }}
-    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.21.8'
-
-      - name: "Verify kinds"
-        run: go run .github/workflows/scripts/kinds/verify-kinds.go
-        env:
-          CODEGEN_VERIFY: 1
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -17,7 +17,6 @@ vendor/
 /docs/menu.yaml
 /requests
 tsconfig.tsbuildinfo
-__debug_bin*

 # Yarn
 .yarn/*
@@ -192,6 +191,3 @@ public/api-spec.json
 deployment_tools_config.json

 .betterer.cache
-
-# Temporary file for backporting PRs
-.pr-body.txt
@@ -13,33 +13,22 @@ ignore-generated-header = false
 severity = "warning"
 confidence = 3

-[linters-settings.depguard.rules.main]
-allow = [] # allow all
-deny = [
-  {pkg = "io/ioutil", desc = "Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details."},
-  {pkg = "gopkg.in/yaml.v2", desc = "Grafana packages are not allowed to depend on gopkg.in/yaml.v2 as gopkg.in/yaml.v3 is now available"},
-  {pkg = "github.com/pkg/errors", desc = "Deprecated: Go 1.13 supports the functionality provided by pkg/errors in the standard library."},
-  {pkg = "github.com/xorcare/pointer", desc = "Use pkg/util.Pointer instead, which is a generic one-liner alternative"},
-  {pkg = "github.com/gofrs/uuid", desc = "Use github.com/google/uuid instead, which we already depend on."},
-]
-
-[linters-settings.depguard.rules.coreplugins]
-deny = [
-  {pkg = "github.com/grafana/grafana/pkg/", desc = "Core plugins are not allowed to depend on Grafana core packages"},
-]
-files = [
-  "**/pkg/tsdb/testdatasource/*",
-  "**/pkg/tsdb/testdatasource/**/*",
-]
+[linters-settings.depguard]
+list-type = "blacklist"
+include-go-root = true
+packages = ["io/ioutil"]
+[[linters-settings.depguard.packages-with-error-message]]
+"io/ioutil" = "Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details."
+"gopkg.in/yaml.v2" = "Grafana packages are not allowed to depend on gopkg.in/yaml.v2 as gopkg.in/yaml.v3 is now available"
+"github.com/pkg/errors" = "Deprecated: Go 1.13 supports the functionality provided by pkg/errors in the standard library."
+"github.com/xorcare/pointer" = "Use pkg/util.Pointer instead, which is a generic one-liner alternative"
+"github.com/gofrs/uuid" = "Use github.com/google/uuid instead, which we already depend on."

 [linters-settings.gocritic]
 enabled-checks = ["ruleguard"]
 [linters-settings.gocritic.settings.ruleguard]
 rules = "pkg/ruleguard.rules.go"

-[linters-settings.nakedret]
-max-func-lines = 60
-
 [linters]
 disable-all = true
 enable = [
@@ -93,11 +82,6 @@ linters = ["stylecheck"]
 text = "ST1001"

 # Enable when appropriate
-# http.CloseNotifier has been deprecated since Go 1.11 and an alternative has been available since Go 1.7: We currently need it in pkg/web/response_writer.go.
-[[issues.exclude-rules]]
-linters = ["staticcheck"]
-text = "SA1019: http.CloseNotifier"
-
 # strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly.
 # Use golang.org/x/text/cases instead.
 [[issues.exclude-rules]]
@@ -80,7 +80,7 @@ var config = {
    {
      url: '${HOST}/?orgId=1',
      wait: 500,
-      threshold: 3,
+      threshold: 0,
    },
    {
      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
@@ -93,7 +93,7 @@ var config = {
      url: '${HOST}/?orgId=1&search=open',
      wait: 500,
      rootElement: '.main-view',
-      threshold: 3,
+      threshold: 0,
    },
    {
      url: '${HOST}/alerting/list',
@@ -1,6 +1,6 @@
 {
  "name": "eslint",
-  "version": "8.44.0-sdk",
+  "version": "8.34.0-sdk",
  "main": "./lib/api.js",
  "type": "commonjs"
 }
@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

 if (existsSync(absPnpApiPath)) {
  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier
+    // Setup the environment to be able to require prettier/index.js
    require(absPnpApiPath).setup();
  }
 }

-// Defer to the real prettier your application uses
-module.exports = absRequire(`prettier`);
+// Defer to the real prettier/index.js your application uses
+module.exports = absRequire(`prettier/index.js`);
@@ -1,6 +1,6 @@
 {
  "name": "prettier",
-  "version": "3.0.0-sdk",
+  "version": "2.8.4-sdk",
  "main": "./index.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/
@@ -82,6 +82,6 @@ Before we can accept your pull request, you need to [sign our CLA](https://grafa
 ## Where do I go from here?

 - Set up your [development environment](contribute/developer-guide.md).
- Learn how to [contribute to our documentation](contribute/documentation/README.md).
- Get started [developing plugins](https://grafana.com/developers/plugin-tools) for Grafana.
+- Learn how to [contribute documentation](contribute/README.md).
+- Get started [developing plugins](https://grafana.com/docs/grafana/latest/developers/plugins/) for Grafana.
 - Look through the resources in the [contribute](contribute) folder.
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1

-ARG BASE_IMAGE=alpine:3.18.3
-ARG JS_IMAGE=node:18-alpine3.18
+ARG BASE_IMAGE=alpine:3.17
+ARG JS_IMAGE=node:18-alpine3.17
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.21.8-alpine3.18
+ARG GO_IMAGE=golang:1.20.4-alpine3.17

 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
@@ -64,7 +64,6 @@ COPY pkg pkg
 COPY scripts scripts
 COPY conf conf
 COPY .github .github
-COPY LICENSE ./

 ENV COMMIT_SHA=${COMMIT_SHA}
 ENV BUILD_BRANCH=${BUILD_BRANCH}
@@ -111,7 +110,7 @@ RUN if grep -i -q alpine /etc/issue; then \
    elif grep -i -q ubuntu /etc/issue; then \
      DEBIAN_FRONTEND=noninteractive && \
      apt-get update && \
-      apt-get install -y ca-certificates curl tzdata musl && \
+      apt-get install -y ca-certificates curl tzdata && \
      apt-get autoremove -y && \
      rm -rf /var/lib/apt/lists/*; \
    else \
@@ -166,7 +165,6 @@ RUN if [ ! $(getent group "$GF_GID") ]; then \

 COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
 COPY --from=js-src /tmp/grafana/public ./public
-COPY --from=go-src /tmp/grafana/LICENSE ./

 EXPOSE 3000

@@ -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 "," " ")
@@ -36,68 +37,36 @@ node_modules: package.json yarn.lock ## Install node modules.

 ##@ Swagger
 SPEC_TARGET = public/api-spec.json
-ENTERPRISE_SPEC_TARGET = public/api-enterprise-spec.json
-MERGED_SPEC_TARGET = public/api-merged.json
+MERGED_SPEC_TARGET := public/api-merged.json
 NGALERT_SPEC_TARGET = pkg/services/ngalert/api/tooling/api.json

 $(NGALERT_SPEC_TARGET):
 	+$(MAKE) -C pkg/services/ngalert/api/tooling api.json

-$(MERGED_SPEC_TARGET): swagger-oss-gen swagger-enterprise-gen $(NGALERT_SPEC_TARGET) $(SWAGGER) ## Merge generated and ngalert API specs
+$(MERGED_SPEC_TARGET): $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) $(SWAGGER) ## Merge generated and ngalert API specs
 	# known conflicts DsPermissionType, AddApiKeyCommand, Json, Duration (identical models referenced by both specs)
-	$(SWAGGER) mixin $(SPEC_TARGET) $(ENTERPRISE_SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)
+	$(SWAGGER) mixin $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)

-swagger-oss-gen: $(SWAGGER) ## Generate API Swagger specification
-	@echo "re-generating swagger for OSS"
-	rm -f $(SPEC_TARGET)
+$(SPEC_TARGET): $(SWAGGER) ## Generate API Swagger specification
 	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
-	--exclude-tag=alpha \
-	--exclude-tag=enterprise
+	--exclude-tag=alpha
+	go run pkg/services/ngalert/api/tooling/cmd/clean-swagger/main.go -if $@ -of $@

-# this file only exists if enterprise is enabled
-ENTERPRISE_EXT_FILE = pkg/extensions/ext.go
-ifeq ("$(wildcard $(ENTERPRISE_EXT_FILE))","") ## if enterprise is not enabled
-swagger-enterprise-gen:
-	@echo "skipping re-generating swagger for enterprise: not enabled"
-else
-swagger-enterprise-gen: $(SWAGGER) ## Generate API Swagger specification
-	@echo "re-generating swagger for enterprise"
-	rm -f $(ENTERPRISE_SPEC_TARGET)
-	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(ENTERPRISE_SPEC_TARGET) \
-	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
-	-x "github.com/prometheus/alertmanager" \
-	-i pkg/api/swagger_tags.json \
-	--exclude-tag=alpha \
-	--include-tag=enterprise
-endif
+swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET) validate-api-spec

-swagger-gen: gen-go $(MERGED_SPEC_TARGET) swagger-validate
-
-swagger-validate: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
+validate-api-spec: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
 	$(SWAGGER) validate $(<)

-swagger-clean:
+clean-api-spec:
 	rm -f $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)

-.PHONY: cleanup-old-git-hooks
-cleanup-old-git-hooks:
-	./scripts/cleanup-husky.sh
-
-.PHONY: lefthook-install
-lefthook-install: cleanup-old-git-hooks $(LEFTHOOK) # install lefthook for pre-commit hooks
-	$(LEFTHOOK) install -f
-
-.PHONY: lefthook-uninstall
-lefthook-uninstall: $(LEFTHOOK)
-	$(LEFTHOOK) uninstall
-
 ##@ OpenAPI 3
 OAPI_SPEC_TARGET = public/openapi3.json

-openapi3-gen: swagger-gen ## Generates OpenApi 3 specs from the Swagger 2 already generated
+openapi3-gen: swagger-api-spec ## Generates OpenApi 3 specs from the Swagger 2 already generated
 	$(GO) run scripts/openapi3/openapi3conv.go $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)

 ##@ Building
@@ -106,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"
@@ -164,13 +133,6 @@ test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
 	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)

-.PHONY: test-go-integration-alertmanager
-test-go-integration-alertmanager: ## Run integration tests for the remote alertmanager (config taken from the mimir_backend block).
-	@echo "test remote alertmanager integration tests"
-	$(GO) clean -testcache
-	AM_URL=http://localhost:8080 AM_TENANT_ID=test AM_PASSWORD=test \
-	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/notifier/...
-
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
@@ -229,7 +191,7 @@ build-docker-full: ## Build Docker image for development.
 	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
+	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--tag grafana/grafana$(TAG_SUFFIX):dev \
 	$(DOCKER_BUILD_ARGS)
@@ -242,10 +204,10 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
+	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
-	--build-arg BASE_IMAGE=ubuntu:22.04 \
-	--build-arg GO_IMAGE=golang:1.21.8 \
+	--build-arg BASE_IMAGE=ubuntu:20.04 \
+	--build-arg GO_IMAGE=golang:1.20.4 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)

@@ -290,9 +252,6 @@ devenv-mysql:
 protobuf: ## Compile protobuf definitions
 	bash scripts/protobuf-check.sh
 	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
-	bash pkg/plugins/backendplugin/secretsmanagerplugin/generate.sh
-	bash pkg/services/store/entity/generate.sh
-	bash pkg/infra/grn/generate.sh

 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"
@@ -318,7 +277,7 @@ scripts/drone/TAGS: $(shell find scripts/drone -name '*.star')
 	etags --lang none --regex="/def \(\w+\)[^:]+:/\1/" --regex="/\s*\(\w+\) =/\1/" $^ -o $@

 format-drone:
-	buildifier --lint=fix -r scripts/drone
+	buildifier -r scripts/drone

 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
@@ -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.

@@ -245,7 +245,7 @@ reporting_distributor = grafana-labs
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 check_for_updates = true

 # Set to false to disable all checks to https://grafana.com
@@ -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.
@@ -454,7 +451,7 @@ auto_assign_org = true
 # Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
 auto_assign_org_id = 1

-# Default role new users will be automatically assigned
+# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
 auto_assign_org_role = Viewer

 # Require email validation before sign up completes
@@ -559,20 +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
-
-# Set to true to include id of identity as a response header
-id_response_header_enabled = false
-
-# Prefix used for the id response header, X-Grafana-Identity-Id
-id_response_header_prefix = X-Grafana
-
-# List of identity namespaces to add id response headers for, separated by space.
-# Available namespaces are user, api-key and service-account.
-# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
-id_response_header_namespaces = user api-key service-account
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -606,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]
@@ -623,7 +603,7 @@ allow_sign_up = true
 auto_login = false
 client_id = some_id
 client_secret =
-scopes = openid email profile
+scopes = api
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
@@ -638,7 +618,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
-use_refresh_token = true

 #################################### Google Auth #########################
 [auth.google]
@@ -649,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
@@ -661,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)
@@ -672,7 +650,6 @@ client_id = some_id
 client_secret =
 scopes = user:email
 allowed_organizations =
-use_refresh_token = false

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

 #################################### Azure AD OAuth #######################
 [auth.azuread]
@@ -701,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
@@ -710,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]
@@ -737,7 +710,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
-use_refresh_token = false

 #################################### Generic OAuth #######################
 [auth.generic_oauth]
@@ -775,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]
@@ -837,9 +808,6 @@ assume_role_enabled = true
 # Specify max no of pages to be returned by the ListMetricPages API
 list_metrics_page_limit = 500

-# Experimental, for use in Grafana Cloud only. Please do not set.
-external_id = 
-
 #################################### Azure ###############################
 [azure]
 # Azure cloud environment where Grafana is hosted
@@ -856,24 +824,6 @@ managed_identity_enabled = false
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 managed_identity_client_id =

-# Specifies whether Azure AD Workload Identity authentication should be enabled in datasources that support it
-# For more documentation on Azure AD Workload Identity, review this documentation:
-# https://azure.github.io/azure-workload-identity/docs/
-# Disabled by default, needs to be explicitly enabled
-workload_identity_enabled = false
-
-# Tenant ID of the Azure AD Workload Identity
-# Allows to override default tenant ID of the Azure AD identity associated with the Kubernetes service account
-workload_identity_tenant_id =
-
-# Client ID of the Azure AD Workload Identity
-# Allows to override default client ID of the Azure AD identity associated with the Kubernetes service account
-workload_identity_client_id =
-
-# Custom path to token file for the Azure AD Workload Identity
-# Allows to set a custom path to the projected service account token file
-workload_identity_token_file =
-
 # Specifies whether user identity authentication (on behalf of currently signed-in user) should be enabled in datasources
 # that support it (requires AAD authentication)
 # Disabled by default, needs to be explicitly enabled
@@ -932,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 =
@@ -1088,9 +1035,6 @@ ha_redis_prefix =
 # provided, a random one will be generated.
 ha_redis_peer_name =

-# The maximum number of simultaneous redis connections.
-ha_redis_max_conns = 5
-
 # Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port.
 ha_listen_address = "0.0.0.0:9094"

@@ -1128,18 +1072,13 @@ execute_alerts = true
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
-max_attempts = 1
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+max_attempts = 3

 # Minimum interval to enforce between rule evaluations. 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 we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # 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.
@@ -1307,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
@@ -1324,8 +1258,6 @@ enabled              = true
 interval_seconds     = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 disable_total_stats = false
-# The interval at which the total stats collector will update the stats. Default is 1800 seconds.
-total_stats_collector_interval_seconds = 1800

 #If both are set, basic auth will be required for the metrics endpoints.
 basic_auth_username =
@@ -1467,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]
@@ -1660,11 +1589,3 @@ server_name =
 proxy_address =
 # Determines if the secure socks proxy should be shown on the datasources page, defaults to true if the feature is enabled
 show_ui = true
-
-################################## Feature Management ##############################################
-[feature_management]
-# Hides specific feature toggles from the feature management page
-hidden_toggles =
-
-# Disables updating specific feature toggles in the feature management page
-read_only_toggles =
@@ -252,7 +252,7 @@
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 ;check_for_updates = true

 # Set to false to disable all checks to https://grafana.com
@@ -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.
@@ -439,7 +436,7 @@
 # Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
 ;auto_assign_org_id = 1

-# Default role new users will be automatically assigned
+# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
 ;auto_assign_org_role = Viewer

 # Require email validation before sign up completes
@@ -548,20 +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
-
-# Set to true to include id of identity as a response header
-;id_response_header_enabled = false
-
-# Prefix used for the id response header, X-Grafana-Identity-Id
-;id_response_header_prefix = X-Grafana
-
-# List of identity namespaces to add id response headers for, separated by space.
-# Available namespaces are user, api-key and service-account.
-# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
-;id_response_header_namespaces = user api-key service-account
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -595,7 +578,6 @@
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
-;skip_org_role_sync = false

 #################################### GitLab Auth #########################
 [auth.gitlab]
@@ -606,7 +588,7 @@
 ;auto_login = false
 ;client_id = some_id
 ;client_secret = some_secret
-;scopes = openid email profile
+;scopes = api
 ;auth_url = https://gitlab.com/oauth/authorize
 ;token_url = https://gitlab.com/oauth/token
 ;api_url = https://gitlab.com/api/v4
@@ -631,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
@@ -667,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
@@ -786,12 +767,6 @@
 # If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
 ; assume_role_enabled = true

-# Specify max no of pages to be returned by the ListMetricPages API
-; list_metrics_page_limit = 500
-
-# Experimental, for use in Grafana Cloud only. Please do not set.
-; external_id = 
-
 #################################### Azure ###############################
 [azure]
 # Azure cloud environment where Grafana is hosted
@@ -808,24 +783,6 @@
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 ;managed_identity_client_id =

-# Specifies whether Azure AD Workload Identity authentication should be enabled in datasources that support it
-# For more documentation on Azure AD Workload Identity, review this documentation:
-# https://azure.github.io/azure-workload-identity/docs/
-# Disabled by default, needs to be explicitly enabled
-;workload_identity_enabled = false
-
-# Tenant ID of the Azure AD Workload Identity
-# Allows to override default tenant ID of the Azure AD identity associated with the Kubernetes service account
-;workload_identity_tenant_id =
-
-# Client ID of the Azure AD Workload Identity
-# Allows to override default client ID of the Azure AD identity associated with the Kubernetes service account
-;workload_identity_client_id =
-
-# Custom path to token file for the Azure AD Workload Identity
-# Allows to set a custom path to the projected service account token file
-;workload_identity_token_file =
-
 # Specifies whether user identity authentication (on behalf of currently signed-in user) should be enabled in datasources
 # that support it (requires AAD authentication)
 # Disabled by default, needs to be explicitly enabled
@@ -885,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 =
@@ -1075,8 +1029,8 @@
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
-;max_attempts = 1
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+;max_attempts = 3

 # Minimum interval to enforce between rule evaluations. 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 we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # 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.
@@ -1224,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
@@ -1243,8 +1192,6 @@
 ;interval_seconds  = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 ;disable_total_stats = false
-# The interval at which the total stats collector will update the stats. Default is 1800 seconds.
-;total_stats_collector_interval_seconds = 1800

 #If both are set, basic auth will be required for the metrics endpoints.
 ; basic_auth_username =
@@ -1379,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]
@@ -1530,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]
@@ -1548,8 +1492,3 @@
 # The address of the socks5 proxy datasources should connect to
 ; proxy_address =
 ; show_ui = true
-
-################################## Feature Management ##############################################
-[feature_management]
-hidden_toggles =
-read_only_toggles =
@@ -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,22 +0,0 @@
-# Upgrading Go Version
-
-Notes on upgrading Go version.
-
-Example PR: https://github.com/grafana/grafana/pull/79329
-
-## The main areas that need to change during the upgrade are:
-
- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/scripts/drone/variables.star#L6
- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Makefile#L264
- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Dockerfile#L6
-
-Make sure to run `make drone` so that changes to `.star` files are reflected and `drone.yml` is generated.
-
-### Additional files to change
-
- Take a look in `.github/workflows` folder for what `go` version is being used there in various workflows.
- Make sure to create a PR with the corresponding changes in `grafana/grafana-enterprise` repository.
-
-## Updating the go.mod file
-
-Please avoid updating the `go.mod` to the newest version unless really necessary. This ensures backwards compatibility and introduces less breaking changes. Always upgrade Go version in the runtime files above first, let them run for a couple of weeks and only then consider updating the `go.mod` file if necessary.
@@ -104,7 +104,7 @@ myOldFunction(name: string) {
 2. Add info in the comment about **when it is going to be removed**
 3. Add info in the comment about **what should be used instead**
 4. In case it's a function or a method, use `deprecationWarning(<file name>, <old name>, <new name>)` to raise attention during runtime as well
-5. Update the [migration guidance](/developers/plugin-tools/migration-guides/) for plugin developers with your instructions
+5. Update the [migration guide](../docs/sources/developers/plugins/migration-guide.md) with your instructions

 ### Communicate

@@ -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-release-guild 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

@@ -13,6 +13,7 @@ The following checklist/summary should give you a quick overview of what to ask/
 - Reviewed and approved?
 - All checks passed?
 - Proper pull request title?
+- Milestone assigned?
 - Add to changelog/release notes?
 - Needs backporting?

@@ -39,17 +40,11 @@ See [formatting guidelines](create-pull-request.md#formatting-guidelines) for mo

 ### Assign a milestone

-Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).
+A milestone **should** be added to every pull request. Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).

 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.

-That being said, _you don't have to assign a milestone manually_ to a pull request.
-Instead, when it is merged & closed then a bot will look for the most appropriate miletone and assign it to the pull request.
-
-That milestone should always reflect the branch that the pull request 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).
-Pull requests targeting `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 pull requests 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?

@@ -85,15 +80,15 @@ The changelog/release notes are divided into sections and here's a description o

 **Features and enhancements:**

-Labeled with `add to changelog` and any of the other section rules don't apply.
+Milestone assigned and labeled with `add to changelog` and any of the other section rules don't apply.

 **Bug fixes:**

-Labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.
+Milestone assigned and labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.

 **Plugin development fixes & changes:**

-Labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.
+Milestone assigned and labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.

 **Deprecations:**

@@ -180,7 +180,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 });
 ```

-Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the getStyles function and instead compose classes using emotion cx function.
+Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the the getStyles function and instead compose classes using emotion cx function.

 #### Use `ALL_CAPS` for constants.

@@ -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,18 +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
-      exemplarTraceIdDestinations:
-      - name: traceID
-        datasourceUid: gdev-tempo
-    secureJsonData:
-      basicAuthPassword: admin #https://grafana.com/docs/grafana/latest/administration/provisioning/#using-environment-variables

  - name: gdev-slow-prometheus
    uid: gdev-slow-prometheus-uid
@@ -251,9 +244,6 @@ datasources:
      - targetUID: gdev-zipkin
        label: "Zipkin traces"
        description: "Related traces stored in Zipkin"
-      - targetUID: gdev-tempo
-        label: "Tempo traces"
-        description: "Related traces stored in Tempo"
      - targetUID: gdev-prometheus
        label: "Logs to metrics"
        description: "Related metrics stored in Prometheus"
@@ -273,10 +263,6 @@ datasources:
          matcherRegex: "traceID=(\\w+)"
          url: "$${__value.raw}"
          datasourceUid: gdev-zipkin
-        - name: "traceID"
-          matcherRegex: "traceID=(\\w+)"
-          url: "$${__value.raw}"
-          datasourceUid: gdev-tempo

  - name: gdev-jaeger
    type: jaeger
@@ -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
@@ -0,0 +1,4 @@
+FROM nginx:1.19.3-alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY htpasswd /etc/nginx/htpasswd
@@ -5,11 +5,5 @@
 # root_url = %(protocol)s://%(domain)s:10080/grafana/

  nginxproxy:
-    image: nginx:1.24-alpine
-    volumes:
-      - "./docker/blocks/auth/nginx_proxy/nginx.conf:/etc/nginx/nginx.conf"
-      - "./docker/blocks/auth/nginx_proxy/htpasswd:/etc/nginx/htpasswd"
-    ports:
-      - "8090:8090"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+    build: docker/blocks/auth/nginx_proxy
+    network_mode: host
@@ -4,20 +4,14 @@ http {
  sendfile on;

  proxy_redirect     off;
-  proxy_set_header   Host $host:$server_port;
+  proxy_set_header   Host $host;
  proxy_set_header   X-Real-IP $remote_addr;
  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
  proxy_set_header   X-Forwarded-Host $server_name;

  server {
-    listen 8090;
+    listen 10080;

-    ###############################################################
-    #  Location is under the sub path /grafana/. We need to update the
-    #  config.ini file accordingly.
-    #  [server]
-    #  root_url = %(protocol)s://%(domain)s:%(http_port)s/grafana/
-    ###############################################################
    location /grafana/ {
      ################################################################
      # Enable these settings to test with basic auth and an auth proxy header
@@ -25,10 +19,8 @@ http {
      # user1: grafana and user2: grafana
      ################################################################

-      auth_basic "Restricted Content";
-      auth_basic_user_file /etc/nginx/htpasswd;
-      # Remove the authentication header meant for NGINX
-      proxy_set_header "Authorization" "";
+      # auth_basic "Restricted Content";
+      # auth_basic_user_file /etc/nginx/htpasswd;

      ################################################################
      # To use the auth proxy header, set the following in custom.ini:
@@ -36,12 +28,11 @@ http {
      # enabled = true
      # header_name = X-WEBAUTH-USER
      # header_property = username
-      # enable_login_token = false
      ################################################################

-      proxy_set_header X-WEBAUTH-USER $remote_user;
+      # proxy_set_header X-WEBAUTH-USER $remote_user;

-      proxy_pass http://host.docker.internal:3000/;
+      proxy_pass http://localhost:3000/;
    }
  }
-}
+}
@@ -10,7 +10,7 @@ http {
  proxy_set_header   X-Forwarded-Host $server_name;

  server {
-    listen 8090;
+    listen 10080;

    location /grafana/ {
      ################################################################
@@ -26,18 +26,17 @@ http {
      # enabled = true
      # header_name = X-WEBAUTH-USER
      # header_property = username
-      # enable_login_token = true
      ################################################################

      location /grafana/login {
        auth_basic "Restricted Content";
        auth_basic_user_file /etc/nginx/htpasswd;
        proxy_set_header X-WEBAUTH-USER $remote_user;
-        proxy_pass http://host.docker.internal:3000/login;
+        proxy_pass http://localhost:3000/login;
      }

      proxy_set_header Authorization "";
-      proxy_pass http://host.docker.internal:3000/;
+      proxy_pass http://localhost:3000/;
    }
  }
 }
@@ -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);
  }
 }
@@ -1 +1 @@
-postgres_version=11.20
+postgres_version=10.15
@@ -1 +1 @@
-postgres_version=11.20
+postgres_version=10.15
@@ -1,4 +1,4 @@
-ARG postgres_version=11.20
+ARG postgres_version=10.15
 FROM postgres:${postgres_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 RUN chown -R postgres:postgres /docker-entrypoint-initdb.d/
@@ -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
@@ -1,40 +0,0 @@
-logs:
-  positions_directory: /tmp/loki-pos
-  configs:
-    - name: default
-      scrape_configs: []
-      clients:
-        - url: http://host.docker.internal:3100/loki/api/v1/push
-traces:
-  configs:
-    - name: default
-      remote_write:
-        - endpoint: http://host.docker.internal:3200
-          insecure: true
-      receivers:
-        otlp:
-          protocols:
-            grpc:
-            http:
-              cors:
-                allowed_origins:
-                  - "*"
-integrations:
-  app_agent_receiver_configs:
-    - autoscrape:
-        enable: false
-      instance: "frontend"
-      logs_instance: "default"
-      traces_instance: "default"
-      server:
-        host: 0.0.0.0
-        port: 12347
-        cors_allowed_origins:
-          - "*"
-      logs_labels: # labels to add to loki log record
-        app: frontend # static value
-        kind: # value will be taken from log items. exception, log, measurement, etc
-      logs_send_timeout: 5000
-      sourcemaps:
-        download: true # will download source file, extract source map location,
-        # download source map and use it to transform stack trace locations
@@ -1,46 +0,0 @@
-  prometheus:
-    image: prom/prometheus:v2.45.0
-    ports:
-      - "9090:9090"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    command: >
-      --enable-feature=remote-write-receiver
-      --enable-feature=exemplar-storage
-      --config.file=/etc/prometheus/prometheus.yml
-      --storage.tsdb.path=/prometheus
-    volumes:
-      - ./docker/blocks/self-instrumentation/prometheus.yaml:/etc/prometheus/prometheus.yml
-  loki:
-    image: grafana/loki:2.8.2
-    ports:
-      - "3100:3100"
-    command: -config.file=/etc/loki/local-config.yaml
-  promtail:
-    image: grafana/promtail:2.8.2
-    command: -config.file=/etc/promtail/promtail.yaml
-    volumes:
-      - ./docker/blocks/self-instrumentation/promtail.yaml:/etc/promtail/promtail.yaml
-      - ../data/log:/var/log/grafana
-  tempo:
-    image: grafana/tempo:2.1.1
-    command: -config.file=/etc/tempo.yaml
-    volumes:
-      - ./docker/blocks/self-instrumentation/tempo.yaml:/etc/tempo.yaml
-    ports:
-      - "14268:14268"
-      - "3200:3200"
-  agent:
-    image: grafana/agent:v0.34.3
-    entrypoint:
-      - /bin/grafana-agent
-      - -server.http.address=0.0.0.0:12345
-      - -config.file=/etc/agent/agent.yaml
-      - -enable-features=integrations-next
-    volumes:
-      - ./docker/blocks/self-instrumentation/agent.yaml:/etc/agent/agent.yaml
-    ports:
-      - "12345:12345"
-      - "12347:12347"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
@@ -1,9 +0,0 @@
-global:
-  scrape_interval:     15s
-  evaluation_interval: 15s
-
-scrape_configs:
-  - job_name: grafana
-    static_configs:
-      - targets:
-        - host.docker.internal:3000
@@ -1,18 +0,0 @@
-server:
-  http_listen_port: 9080
-  grpc_listen_port: 0
-
-positions:
-  filename: /tmp/positions.yaml
-
-clients:
-  - url: http://loki:3100/loki/api/v1/push
-
-scrape_configs:
- job_name: hosted-grafana/grafana
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: hosted-grafana/grafana
-      __path__: /var/log/grafana/*log
@@ -1,19 +0,0 @@
-# Self Instrumentation
-
-To run this source, in the Grafana repo root:
-
-```
-make devenv sources=self-instrumentation
-```
-
-This will setup Prometheus, Loki and Tempo.
-
-You then need to run Grafana with those added config:
-
-```ini
-[log.frontend]
-enabled = true
-
-[tracing.opentelemetry.jaeger]
-address = http://localhost:14268/api/traces
-```
@@ -1,44 +0,0 @@
-server:
-  http_listen_port: 3200
-
-distributor:
-  receivers:                           # this configuration will listen on all ports and protocols that tempo is capable of.
-    jaeger:                            # the receives all come from the OpenTelemetry collector.  more configuration information can
-      protocols:                       # be found there: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver
-        thrift_http:                   #
-        grpc:                          # for a production deployment you should only enable the receivers you need!
-        thrift_binary:
-        thrift_compact:
-    zipkin:
-    otlp:
-      protocols:
-        http:
-        grpc:
-    opencensus:
-
-compactor:
-  compaction:
-    block_retention: 1h  
-
-metrics_generator:
-  registry:
-    external_labels:
-      source: tempo
-      cluster: docker-compose
-  storage:
-    path: /tmp/tempo/generator/wal
-    remote_write:
-      - url: http://prometheus:9090/api/v1/write
-        send_exemplars: true
-
-storage:
-  trace:
-    backend: local                     # backend configuration to use
-    wal:
-      path: /tmp/tempo/wal             # where to store the the wal locally
-    local:
-      path: /tmp/tempo/blocks
-
-overrides:
-  metrics_generator_processors: [service-graphs, span-metrics]
-  
@@ -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.
-# A changelog is included in the head of the `make-docs` script.
+# 2.0.0 (2023-05-18)
 include variables.mk
 -include variables.mk.local

@@ -76,11 +76,11 @@ docs-rm: ## Remove the docs container.

 .PHONY: docs-pull
 docs-pull: ## Pull documentation base image.
-	$(PODMAN) pull -q $(DOCS_IMAGE)
+	$(PODMAN) pull $(DOCS_IMAGE)

 make-docs: ## Fetch the latest make-docs script.
 make-docs:
-	if [[ ! -f "$(CURDIR)/make-docs" ]]; then
+	if [[ ! -f "$(PWD)/make-docs" ]]; then
 		echo 'WARN: No make-docs script found in the working directory. Run `make update` to download it.' >&2
 		exit 1
 	fi
@@ -88,27 +88,32 @@ make-docs:
 .PHONY: docs
 docs: ## Serve documentation locally, which includes pulling the latest `DOCS_IMAGE` (default: `grafana/docs-base:latest`) container image. See also `docs-no-pull`.
 docs: docs-pull make-docs
-	$(CURDIR)/make-docs $(PROJECTS)
+	$(PWD)/make-docs $(PROJECTS)

 .PHONY: docs-no-pull
 docs-no-pull: ## Serve documentation locally without pulling the `DOCS_IMAGE` (default: `grafana/docs-base:latest`) container image.
 docs-no-pull: make-docs
-	$(CURDIR)/make-docs $(PROJECTS)
+	$(PWD)/make-docs $(PROJECTS)

 .PHONY: docs-debug
 docs-debug: ## Run Hugo web server with debugging enabled. TODO: support all SERVER_FLAGS defined in website Makefile.
 docs-debug: make-docs
-	WEBSITE_EXEC='hugo server --bind 0.0.0.0 --port 3002 --debug' $(CURDIR)/make-docs $(PROJECTS)
+	WEBSITE_EXEC='hugo server --bind 0.0.0.0 --port 3002 --debug' $(PWD)/make-docs $(PROJECTS)

 .PHONY: doc-validator
 doc-validator: ## Run doc-validator on the entire docs folder.
 doc-validator: make-docs
-	DOCS_IMAGE=$(DOC_VALIDATOR_IMAGE) $(CURDIR)/make-docs $(PROJECTS)
+	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
-	DOCS_IMAGE=$(VALE_IMAGE) $(CURDIR)/make-docs $(PROJECTS)
+	DOCS_IMAGE=$(VALE_IMAGE) $(PWD)/make-docs $(PROJECTS)

 .PHONY: update
 update: ## Fetch the latest version of this Makefile and the `make-docs` script from Writers' Toolkit.
--- 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